Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [Bug 9796] source-check broken for Git downloads
From: bugzilla at busybox.net @ 2017-05-10 20:04 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <bug-9796-163@https.bugs.busybox.net/>

https://bugs.busybox.net/show_bug.cgi?id=9796

Thomas Petazzoni <thomas.petazzoni@free-electrons.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Assignee|unassigned at buildroot.uclibc |yann.morin.1998 at free.fr
                   |.org                        |

-- 
You are receiving this mail because:
You are on the CC list for the bug.

^ permalink raw reply

* [Buildroot] [PATCH 1/3] refpolicy: new package
From: Thomas Petazzoni @ 2017-05-10 19:50 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <CANQCQpb44XanQ5+M8_KbC8XvA_Uwz1x3rVmTrfPf0HbTY-OjHg@mail.gmail.com>

Hello,

On Wed, 10 May 2017 12:58:46 -0500, Matthew Weber wrote:

> On Wed, May 10, 2017 at 12:46 PM, Adam Duskett <aduskett@gmail.com> wrote:
> > The patch is for adding selinux reference policy (refpolicy).
> > It is a complete SELinux policy that can be used as the system policy
> > for a variety of systems and used as the basis for creating other policies.
> >  
> 
> Similar patchset submitted here:
> https://patchwork.ozlabs.org/patch/711535/

Exactly what I was going to say: what is the difference between this
new submission, and the one from Bryce Ferguson already in patchwork ?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply

* [Buildroot] [PATCH 2/2] docker-engine: bump to version 17.05.0-ce
From: Christian Stewart @ 2017-05-10 18:08 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <CAPi7W81HP7E4Ce+_CRVJ9dhjodKWEVhL4v9xS=5bJ59eMf1WVg@mail.gmail.com>

Hi Fabrice, All,

On Wed, May 10, 2017 at 3:23 AM, Fabrice Fontaine
<fontaine.fabrice@gmail.com> wrote:
> Since April 18th (and so starting from this release), docker has been
> renamed "moby":

That's not actually true, it's still called Docker Community Edition,
which is why everyone's so confused. The CLI is called docker, the
system is Docker, everything is still Docker, the distribution is
docker-ce, the Go imports all point to docker/docker.

They are introducing "moby" as a name for a collection of components
that when assembled together form Docker. It's still appropriate to
call the package docker-engine, and as such I do not recommend we
rename it at this time. Moby will be a new CLI used in development to
assemble these components together, or so they say.

> If you agree, I would also suggest to rename docker-containerd to containerd
> as containerd has now its own repository and website (https://containerd.io)

Yes, we should do this. However, I recommend we take the following steps:

 - Apply this series now, and try to get it into the next buildroot
release as it's a bugfix and general release of Docker corresponding
with this Buildroot release (2017.05).
 - In next, rename docker-containerd to containerd, and have the
docker-engine package simlink /usr/bin/docker-containerd to
/usr/bin/containerd, as is done in my other patch series introducing
docker-init. I am happy to supply the series to do this change.

Thoughts?

Best,
Christian Stewart

^ permalink raw reply

* [Buildroot] [PATCH 3/3] refpolicy: add ability to set default state.
From: Matthew Weber @ 2017-05-10 17:59 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510174700.30734-3-aduskett@codeblue.com>

Adam,

On Wed, May 10, 2017 at 12:47 PM, Adam Duskett <aduskett@gmail.com> wrote:
> SELinux requires a config file in /etc/selinux which controls the state
> of SELinux on the system.
>
> This config file has two options set in it:
> SELINUX which set's the state of selinux on boot.
> SELINUXTYPE which should equal the name of the policy.  In this case, the
> default name is targeted.
>
> This patch adds:
> - A choice menu on Config.in that allows the user to select a default
>   SELinux state.
>
> - A basic config file that will be installed to
>   target/etc/selinux and will set SELINUX= to the selected state.
>

Similar patchset submitted here:
https://patchwork.ozlabs.org/patch/711537/
https://patchwork.ozlabs.org/patch/711536/

> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/refpolicy/Config.in    | 25 +++++++++++++++++++++++++
>  package/refpolicy/config       |  9 +++++++++
>  package/refpolicy/refpolicy.mk |  6 ++++++
>  3 files changed, 40 insertions(+)
>  create mode 100644 package/refpolicy/config
>
> diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in
> index e12222e..b6f86d3 100644
> --- a/package/refpolicy/Config.in
> +++ b/package/refpolicy/Config.in
> @@ -33,5 +33,30 @@ if BR2_PACKAGE_REFPOLICY
>  config BR2_PACKAGE_REFPOLICY_VERSION
>         string "Policy version"
>         default "30"
> +choice
> +       prompt "SELinux default state"
> +       default BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE
> +
> +config BR2_PACKAGE_REFPOLICY_STATE_ENFORCING
> +       bool "Enforcing"
> +       help
> +         SELinux security policy is enforced
> +
> +config BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE
> +       bool "Permissive"
> +       help
> +         SELinux prints warnings instead of enforcing
> +
> +config BR2_PACKAGE_REFPOLICY_STATE_DISABLED
> +       bool "Disabled"
> +       help
> +         No SELinux policy is loaded
> +endchoice
> +
> +config BR2_PACKAGE_REFPOLICY_STATE
> +       string
> +       default "permissive" if BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE
> +       default "enforcing" if BR2_PACKAGE_REFPOLICY_STATE_ENFORCING
> +       default "disabled" if BR2_PACKAGE_REFPOLICY_STATE_DISABLED
>
>  endif
> diff --git a/package/refpolicy/config b/package/refpolicy/config
> new file mode 100644
> index 0000000..a45a349
> --- /dev/null
> +++ b/package/refpolicy/config
> @@ -0,0 +1,9 @@
> +# This file controls the state of SELinux on the system.
> +# SELINUX= can take one of these three values:
> +#     enforcing - SELinux security policy is enforced.
> +#     permissive - SELinux prints warnings instead of enforcing.
> +#     disabled - No SELinux policy is loaded.
> +SELINUX=disabled
> +
> +SELINUXTYPE=targeted
> +
> diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk
> index 1eb0c54..c982014 100644
> --- a/package/refpolicy/refpolicy.mk
> +++ b/package/refpolicy/refpolicy.mk
> @@ -23,6 +23,7 @@ REFPOLICY_DEPENDENCIES += \
>         policycoreutils
>
>  REFPOLICY_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/site-packages
> +REFPOLICY_NAME = "targeted"
>
>  # Cannot use multiple threads to build the reference policy
>  REFPOLICY_MAKE = PYTHON="$(HOST_DIR)/usr/bin/python2" $(TARGET_MAKE_ENV) $(MAKE1)
> @@ -44,6 +45,11 @@ endef
>
>  define REFPOLICY_INSTALL_TARGET_CMDS
>         $(REFPOLICY_MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
> +       $(INSTALL) -m 0755 -D package/refpolicy/config \
> +               $(TARGET_DIR)/etc/selinux/config
> +
> +       $(SED) "/^SELINUX=/c\SELINUX=$(BR2_PACKAGE_REFPOLICY_STATE)" \
> +               $(TARGET_DIR)/etc/selinux/config
>  endef
>
>  $(eval $(generic-package))
> --
> 2.9.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

^ permalink raw reply

* [Buildroot] [PATCH 1/3] refpolicy: new package
From: Matthew Weber @ 2017-05-10 17:58 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510174700.30734-1-aduskett@codeblue.com>

Adam,

On Wed, May 10, 2017 at 12:46 PM, Adam Duskett <aduskett@gmail.com> wrote:
> The patch is for adding selinux reference policy (refpolicy).
> It is a complete SELinux policy that can be used as the system policy
> for a variety of systems and used as the basis for creating other policies.
>

Similar patchset submitted here:
https://patchwork.ozlabs.org/patch/711535/

> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/Config.in                |  1 +
>  package/refpolicy/Config.in      | 29 ++++++++++++++++++++++++
>  package/refpolicy/refpolicy.hash |  2 ++
>  package/refpolicy/refpolicy.mk   | 49 ++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 81 insertions(+)
>  create mode 100644 package/refpolicy/Config.in
>  create mode 100644 package/refpolicy/refpolicy.hash
>  create mode 100644 package/refpolicy/refpolicy.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index d57813c..6aa6885 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1754,6 +1754,7 @@ endmenu
>  menu "Security"
>         source "package/checkpolicy/Config.in"
>         source "package/policycoreutils/Config.in"
> +       source "package/refpolicy/Config.in"
>         source "package/sepolgen/Config.in"
>         source "package/setools/Config.in"
>  endmenu
> diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in
> new file mode 100644
> index 0000000..e772cac
> --- /dev/null
> +++ b/package/refpolicy/Config.in
> @@ -0,0 +1,29 @@
> +config BR2_PACKAGE_REFPOLICY
> +       bool "refpolicy"
> +       depends on BR2_TOOLCHAIN_HAS_THREADS # policycoreutils
> +       depends on BR2_TOOLCHAIN_USES_GLIBC # policycoreutils
> +       select BR2_PACKAGE_POLICYCOREUTILS
> +       select BR2_PACKAGE_BUSYBOX_SELINUX if BR2_PACKAGE_BUSYBOX
> +       help
> +         The SELinux Reference Policy project (refpolicy) is a
> +         complete SELinux policy that can be used as the system
> +         policy for a variety of systems and used as the basis
> +         for creating other policies. Reference Policy was originally
> +         based on the NSA example policy, but aims to accomplish
> +         many additional goals.
> +
> +         The current refpolicy does not fully support Buildroot
> +         and needs modifications to work with the default system
> +         file layout. These changes should be added as patches to
> +         the refpolicy that modify a single SELinux policy.
> +
> +         The refpolicy works for the most part in permissive mode. Only
> +         the basic set of utilities are enabled in the example policy
> +         config and some of the pathing in the policies is not correct.
> +         Individual policies would need to be tweaked to get everything
> +         functioning properly.
> +
> +         https://github.com/TresysTechnology/refpolicy
> +
> +comment "refpolicy needs a toolchain w/ threads, glibc"
> +       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
> diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash
> new file mode 100644
> index 0000000..7aeac41
> --- /dev/null
> +++ b/package/refpolicy/refpolicy.hash
> @@ -0,0 +1,2 @@
> +#From https://github.com/TresysTechnology/refpolicy/wiki/DownloadRelease
> +sha256 08f9e2afc5e4939c23e56deeec7c47da029d7b85d82fb4ded01a36eb5da0651e  refpolicy-RELEASE_2_20170204.tar.gz
> diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk
> new file mode 100644
> index 0000000..d565cbd
> --- /dev/null
> +++ b/package/refpolicy/refpolicy.mk
> @@ -0,0 +1,49 @@
> +################################################################################
> +#
> +# refpolicy
> +#
> +################################################################################
> +
> +REFPOLICY_VERSION = RELEASE_2_20170204
> +
> +# Do not use GitHub helper as git submodules are needed for refpolicy-contrib
> +REFPOLICY_SITE = https://github.com/TresysTechnology/refpolicy.git
> +REFPOLICY_SITE_METHOD = git
> +REFPOLICY_GIT_SUBMODULES = y
> +REFPOLICY_LICENSE = GPLv2
> +REFPOLICY_LICENSE_FILES = COPYING
> +REFPOLICY_INSTALL_STAGING = YES
> +REFPOLICY_DEPENDENCIES += \
> +       host-m4 \
> +       host-checkpolicy \
> +       host-policycoreutils \
> +       host-setools \
> +       host-gawk \
> +       host-python \
> +       policycoreutils
> +
> +REFPOLICY_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/site-packages
> +
> +# Cannot use multiple threads to build the reference policy
> +REFPOLICY_MAKE = PYTHON="$(HOST_DIR)/usr/bin/python2" $(TARGET_MAKE_ENV) $(MAKE1)
> +
> +define REFPOLICY_CONFIGURE_CMDS
> +       $(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = 30" $(@D)/build.conf
> +       $(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf
> +       $(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf
> +endef
> +
> +define REFPOLICY_BUILD_CMDS
> +       $(REFPOLICY_MAKE) -C $(@D) bare conf DESTDIR=$(STAGING_DIR)
> +endef
> +
> +define REFPOLICY_INSTALL_STAGING_CMDS
> +       $(REFPOLICY_MAKE) -C $(@D) install-src install-headers \
> +       DESTDIR=$(STAGING_DIR)
> +endef
> +
> +define REFPOLICY_INSTALL_TARGET_CMDS
> +       $(REFPOLICY_MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
> +endef
> +
> +$(eval $(generic-package))
> --
> 2.9.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.

^ permalink raw reply

* [Buildroot] [PATCH 3/3] refpolicy: add ability to set default state.
From: Adam Duskett @ 2017-05-10 17:47 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510174700.30734-1-aduskett@codeblue.com>

SELinux requires a config file in /etc/selinux which controls the state
of SELinux on the system.

This config file has two options set in it:
SELINUX which set's the state of selinux on boot.
SELINUXTYPE which should equal the name of the policy.  In this case, the
default name is targeted.

This patch adds:
- A choice menu on Config.in that allows the user to select a default
  SELinux state.

- A basic config file that will be installed to
  target/etc/selinux and will set SELINUX= to the selected state.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
 package/refpolicy/Config.in    | 25 +++++++++++++++++++++++++
 package/refpolicy/config       |  9 +++++++++
 package/refpolicy/refpolicy.mk |  6 ++++++
 3 files changed, 40 insertions(+)
 create mode 100644 package/refpolicy/config

diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in
index e12222e..b6f86d3 100644
--- a/package/refpolicy/Config.in
+++ b/package/refpolicy/Config.in
@@ -33,5 +33,30 @@ if BR2_PACKAGE_REFPOLICY
 config BR2_PACKAGE_REFPOLICY_VERSION
 	string "Policy version"
 	default "30"
+choice
+	prompt "SELinux default state"
+	default BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE
+
+config BR2_PACKAGE_REFPOLICY_STATE_ENFORCING
+	bool "Enforcing"
+	help
+	  SELinux security policy is enforced
+
+config BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE
+	bool "Permissive"
+	help
+	  SELinux prints warnings instead of enforcing
+
+config BR2_PACKAGE_REFPOLICY_STATE_DISABLED
+	bool "Disabled"
+	help
+	  No SELinux policy is loaded
+endchoice
+
+config BR2_PACKAGE_REFPOLICY_STATE
+	string
+	default "permissive" if BR2_PACKAGE_REFPOLICY_STATE_PERMISSIVE
+	default "enforcing" if BR2_PACKAGE_REFPOLICY_STATE_ENFORCING
+	default "disabled" if BR2_PACKAGE_REFPOLICY_STATE_DISABLED
 
 endif
diff --git a/package/refpolicy/config b/package/refpolicy/config
new file mode 100644
index 0000000..a45a349
--- /dev/null
+++ b/package/refpolicy/config
@@ -0,0 +1,9 @@
+# This file controls the state of SELinux on the system.
+# SELINUX= can take one of these three values:
+#     enforcing - SELinux security policy is enforced.
+#     permissive - SELinux prints warnings instead of enforcing.
+#     disabled - No SELinux policy is loaded.
+SELINUX=disabled
+
+SELINUXTYPE=targeted
+
diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk
index 1eb0c54..c982014 100644
--- a/package/refpolicy/refpolicy.mk
+++ b/package/refpolicy/refpolicy.mk
@@ -23,6 +23,7 @@ REFPOLICY_DEPENDENCIES += \
 	policycoreutils
 
 REFPOLICY_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/site-packages
+REFPOLICY_NAME = "targeted"
 
 # Cannot use multiple threads to build the reference policy
 REFPOLICY_MAKE = PYTHON="$(HOST_DIR)/usr/bin/python2" $(TARGET_MAKE_ENV) $(MAKE1)
@@ -44,6 +45,11 @@ endef
 
 define REFPOLICY_INSTALL_TARGET_CMDS
 	$(REFPOLICY_MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
+	$(INSTALL) -m 0755 -D package/refpolicy/config \
+		$(TARGET_DIR)/etc/selinux/config
+
+	$(SED) "/^SELINUX=/c\SELINUX=$(BR2_PACKAGE_REFPOLICY_STATE)" \
+		$(TARGET_DIR)/etc/selinux/config
 endef
 
 $(eval $(generic-package))
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH 2/3] refpolicy: add ability to specify policy version
From: Adam Duskett @ 2017-05-10 17:46 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510174700.30734-1-aduskett@codeblue.com>

Refpolicy by default will build the highest version supported.
This may cause older kernels to not load the policy.

This patch adds a custom policy version string which is defaulted
to 30, which is the highest supported as of today.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
 package/refpolicy/Config.in    | 8 ++++++++
 package/refpolicy/refpolicy.mk | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in
index e772cac..e12222e 100644
--- a/package/refpolicy/Config.in
+++ b/package/refpolicy/Config.in
@@ -27,3 +27,11 @@ config BR2_PACKAGE_REFPOLICY
 
 comment "refpolicy needs a toolchain w/ threads, glibc"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
+
+if BR2_PACKAGE_REFPOLICY
+
+config BR2_PACKAGE_REFPOLICY_VERSION
+	string "Policy version"
+	default "30"
+
+endif
diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk
index d565cbd..1eb0c54 100644
--- a/package/refpolicy/refpolicy.mk
+++ b/package/refpolicy/refpolicy.mk
@@ -28,7 +28,7 @@ REFPOLICY_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/site-p
 REFPOLICY_MAKE = PYTHON="$(HOST_DIR)/usr/bin/python2" $(TARGET_MAKE_ENV) $(MAKE1)
 
 define REFPOLICY_CONFIGURE_CMDS
-	$(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = 30" $(@D)/build.conf
+	$(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = $(BR2_PACKAGE_REFPOLICY_VERSION)" $(@D)/build.conf
 	$(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf
 	$(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf
 endef
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH 1/3] refpolicy: new package
From: Adam Duskett @ 2017-05-10 17:46 UTC (permalink / raw)
  To: buildroot

The patch is for adding selinux reference policy (refpolicy).
It is a complete SELinux policy that can be used as the system policy
for a variety of systems and used as the basis for creating other policies.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
 package/Config.in                |  1 +
 package/refpolicy/Config.in      | 29 ++++++++++++++++++++++++
 package/refpolicy/refpolicy.hash |  2 ++
 package/refpolicy/refpolicy.mk   | 49 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+)
 create mode 100644 package/refpolicy/Config.in
 create mode 100644 package/refpolicy/refpolicy.hash
 create mode 100644 package/refpolicy/refpolicy.mk

diff --git a/package/Config.in b/package/Config.in
index d57813c..6aa6885 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1754,6 +1754,7 @@ endmenu
 menu "Security"
 	source "package/checkpolicy/Config.in"
 	source "package/policycoreutils/Config.in"
+	source "package/refpolicy/Config.in"
 	source "package/sepolgen/Config.in"
 	source "package/setools/Config.in"
 endmenu
diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in
new file mode 100644
index 0000000..e772cac
--- /dev/null
+++ b/package/refpolicy/Config.in
@@ -0,0 +1,29 @@
+config BR2_PACKAGE_REFPOLICY
+	bool "refpolicy"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # policycoreutils
+	depends on BR2_TOOLCHAIN_USES_GLIBC # policycoreutils
+	select BR2_PACKAGE_POLICYCOREUTILS
+	select BR2_PACKAGE_BUSYBOX_SELINUX if BR2_PACKAGE_BUSYBOX
+	help
+	  The SELinux Reference Policy project (refpolicy) is a
+	  complete SELinux policy that can be used as the system
+	  policy for a variety of systems and used as the basis
+	  for creating other policies. Reference Policy was originally
+	  based on the NSA example policy, but aims to accomplish
+	  many additional goals.
+
+	  The current refpolicy does not fully support Buildroot
+	  and needs modifications to work with the default system
+	  file layout. These changes should be added as patches to
+	  the refpolicy that modify a single SELinux policy.
+
+	  The refpolicy works for the most part in permissive mode. Only
+	  the basic set of utilities are enabled in the example policy
+	  config and some of the pathing in the policies is not correct.
+	  Individual policies would need to be tweaked to get everything
+	  functioning properly.
+
+	  https://github.com/TresysTechnology/refpolicy
+
+comment "refpolicy needs a toolchain w/ threads, glibc"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash
new file mode 100644
index 0000000..7aeac41
--- /dev/null
+++ b/package/refpolicy/refpolicy.hash
@@ -0,0 +1,2 @@
+#From https://github.com/TresysTechnology/refpolicy/wiki/DownloadRelease
+sha256 08f9e2afc5e4939c23e56deeec7c47da029d7b85d82fb4ded01a36eb5da0651e  refpolicy-RELEASE_2_20170204.tar.gz
diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk
new file mode 100644
index 0000000..d565cbd
--- /dev/null
+++ b/package/refpolicy/refpolicy.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# refpolicy
+#
+################################################################################
+
+REFPOLICY_VERSION = RELEASE_2_20170204
+
+# Do not use GitHub helper as git submodules are needed for refpolicy-contrib
+REFPOLICY_SITE = https://github.com/TresysTechnology/refpolicy.git
+REFPOLICY_SITE_METHOD = git
+REFPOLICY_GIT_SUBMODULES = y
+REFPOLICY_LICENSE = GPLv2
+REFPOLICY_LICENSE_FILES = COPYING
+REFPOLICY_INSTALL_STAGING = YES
+REFPOLICY_DEPENDENCIES += \
+	host-m4 \
+	host-checkpolicy \
+	host-policycoreutils \
+	host-setools \
+	host-gawk \
+	host-python \
+	policycoreutils
+
+REFPOLICY_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/site-packages
+
+# Cannot use multiple threads to build the reference policy
+REFPOLICY_MAKE = PYTHON="$(HOST_DIR)/usr/bin/python2" $(TARGET_MAKE_ENV) $(MAKE1)
+
+define REFPOLICY_CONFIGURE_CMDS
+	$(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = 30" $(@D)/build.conf
+	$(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf
+	$(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf
+endef
+
+define REFPOLICY_BUILD_CMDS
+	$(REFPOLICY_MAKE) -C $(@D) bare conf DESTDIR=$(STAGING_DIR)
+endef
+
+define REFPOLICY_INSTALL_STAGING_CMDS
+	$(REFPOLICY_MAKE) -C $(@D) install-src install-headers \
+	DESTDIR=$(STAGING_DIR)
+endef
+
+define REFPOLICY_INSTALL_TARGET_CMDS
+	$(REFPOLICY_MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
+endef
+
+$(eval $(generic-package))
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [for-master] package/expedite: bump to the current master
From: Romain Naour @ 2017-05-10 16:48 UTC (permalink / raw)
  To: buildroot

The current master is ahead of one commit, this commit include
the fix for the build issue reported upstream [1].
Remove the patch 0001 which is no longer necessary.

[1] https://phab.enlightenment.org/T5440

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 .../0001-fix-build-failure-with-gcc-5.patch        | 289 ---------------------
 package/expedite/expedite.hash                     |   2 +-
 package/expedite/expedite.mk                       |   2 +-
 3 files changed, 2 insertions(+), 291 deletions(-)
 delete mode 100644 package/expedite/0001-fix-build-failure-with-gcc-5.patch

diff --git a/package/expedite/0001-fix-build-failure-with-gcc-5.patch b/package/expedite/0001-fix-build-failure-with-gcc-5.patch
deleted file mode 100644
index 2d5d6ef..0000000
--- a/package/expedite/0001-fix-build-failure-with-gcc-5.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-From 01a29e6a1d2ed083d1a1884dbca37ae518f354c7 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 30 Apr 2017 12:07:02 +0200
-Subject: [PATCH] fix build failure with gcc < 5
-
-Definition of variables inside the initialization part of for() loops
-was added by [1] and produce some build failure with "old" gcc version
-(gcc < 5).
-
-This way of writing for loop is not consistent with the rest of the
-code. So revert to the C89 for loop syntax.
-
-Reported upstream:
-https://phab.enlightenment.org/T5440
-
-[1] https://git.enlightenment.org/tools/expedite.git/commit/?id=0529ce56b6fb01e9651e76461e9608e15a040fb3
-
-Fixes:
-http://autobuild.buildroot.net/results/930/930796603d37bc309a591eec68037192c51028ce
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/bin/image_data_argb.c                               |  9 ++++++---
- src/bin/image_data_argb_alpha.c                         |  6 ++++--
- src/bin/image_data_ycbcr601pl.c                         | 12 ++++++++----
- .../image_data_ycbcr601pl_map_nearest_solid_rotate.c    | 12 ++++++++----
- src/bin/image_data_ycbcr601pl_map_solid_rotate.c        | 12 ++++++++----
- src/bin/image_data_ycbcr601pl_wide_stride.c             | 17 +++++++++++------
- 6 files changed, 45 insertions(+), 23 deletions(-)
-
-diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
-index d5889ce..9c607b2 100644
---- a/src/bin/image_data_argb.c
-+++ b/src/bin/image_data_argb.c
-@@ -20,12 +20,13 @@ static Evas_Object *o_images[1];
- /* setup */
- static void _setup(void)
- {
-+   int i;
-    Evas_Object *o;
-    Eina_Slice sl;
- 
-    sl.len = 640 * 480 * 4;
-    sl.mem = malloc(sl.len);
--   for (int i = 0; i < 1; i++)
-+   for (i = 0; i < 1; i++)
-      {
-         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-         o_images[i] = o;
-@@ -42,7 +43,8 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-         Evas_Object *o = o_images[i];
-         Eina_Slice sl = {};
-@@ -56,7 +58,8 @@ static void _cleanup(void)
- /* loop - do things */
- static void _loop(double t, int f)
- {
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-         Evas_Object *o = o_images[i];
-         unsigned int *data, *p;
-diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
-index 79f4c54..ffbe57e 100644
---- a/src/bin/image_data_argb_alpha.c
-+++ b/src/bin/image_data_argb_alpha.c
-@@ -20,12 +20,13 @@ static Evas_Object *o_images[1];
- /* setup */
- static void _setup(void)
- {
-+   int i;
-    Evas_Object *o;
-    Eina_Slice sl;
- 
-    sl.len = 640 * 480 * 4;
-    sl.mem = malloc(sl.len);
--   for (int i = 0; i < 1; i++)
-+   for (i = 0; i < 1; i++)
-      {
-         o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-         o_images[i] = o;
-@@ -42,7 +43,8 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-         Evas_Object *o = o_images[i];
-         Eina_Slice sl = {};
-diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
-index 032d5b3..e126e98 100644
---- a/src/bin/image_data_ycbcr601pl.c
-+++ b/src/bin/image_data_ycbcr601pl.c
-@@ -21,9 +21,11 @@ static Eina_Slice slice[3];
- /* setup */
- static void _setup(void)
- {
-+   int i;
-    FILE *f;
--   for (int i = 0; i < 1; i++)
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-         o_images[i] = o;
-         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -37,7 +39,7 @@ static void _setup(void)
-         slice[2].len = 320 * 240;
-         f = fopen(build_path("tp.yuv"), "rb");
-         if (!f) continue;
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              slice[p].mem = malloc(slice[p].len);
-              fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -51,10 +53,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = o_images[i];
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
-              free((void *) slice[p].mem);
-diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
-index 0a5bcf4..db52b0b 100644
---- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
-+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
-@@ -21,9 +21,11 @@ static Eina_Slice slice[3];
- /* setup */
- static void _setup(void)
- {
-+   int i;
-    FILE *f;
--   for (int i = 0; i < 1; i++)
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-         o_images[i] = o;
-         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -37,7 +39,7 @@ static void _setup(void)
-         slice[2].len = 320 * 240;
-         f = fopen(build_path("tp.yuv"), "rb");
-         if (!f) continue;
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              slice[p].mem = malloc(slice[p].len);
-              fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -51,10 +53,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = o_images[i];
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
-              free((void *) slice[p].mem);
-diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
-index 355293f..ac4364d 100644
---- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
-+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
-@@ -22,8 +22,10 @@ static Eina_Slice slice[3];
- static void _setup(void)
- {
-    FILE *f;
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-         o_images[i] = o;
-         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -37,7 +39,7 @@ static void _setup(void)
-         slice[2].len = 320 * 240;
-         f = fopen(build_path("tp.yuv"), "rb");
-         if (!f) continue;
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              slice[p].mem = malloc(slice[p].len);
-              fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -51,10 +53,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = o_images[i];
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
-              free((void *) slice[p].mem);
-diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
-index d4e8fa2..9adb62f 100644
---- a/src/bin/image_data_ycbcr601pl_wide_stride.c
-+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
-@@ -21,11 +21,13 @@ static Eina_Slice slice[3];
- /* setup */
- static void _setup(void)
- {
-+   int i;
-    int stride;
-    FILE *f;
-    int w = 320 - 16;
--   for (int i = 0; i < 1; i++)
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
-         o_images[i] = o;
-         efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -41,7 +43,7 @@ static void _setup(void)
-         f = fopen(build_path("tp.yuv"), "rb");
-         if (!f) continue;
-         stride = 640;
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              slice[p].mem = malloc(slice[p].len);
-              fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -57,10 +59,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
--   for (int i = 0; i < 1; i++)
-+   int i;
-+   for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = o_images[i];
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0,
-                                         EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
-@@ -77,11 +81,12 @@ static void _loop(double t, int f)
-    Evas_Coord x, y, w, h;
-    for (i = 0; i < 1; i++)
-      {
-+        int p;
-         Evas_Object *o = o_images[i];
-         Eina_Slice sl[3];
-         int stride;
- 
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           efl_gfx_buffer_managed_get(o, &sl[p], p);
- 
-         w = 640;
-@@ -97,7 +102,7 @@ static void _loop(double t, int f)
-         if (w > 640) w = 320;
- 
-         stride = 640;
--        for (int p = 0; p < 3; p++)
-+        for (p = 0; p < 3; p++)
-           {
-              efl_gfx_buffer_managed_set(o, &sl[p], w, 480, stride,
-                                         EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
--- 
-2.9.3
-
diff --git a/package/expedite/expedite.hash b/package/expedite/expedite.hash
index 2d1db59..828ee05 100644
--- a/package/expedite/expedite.hash
+++ b/package/expedite/expedite.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256 007e382861555f1023b679e21ff44122b0622c514ce8ef9d7c390b9ac1511009 expedite-0529ce56b6fb01e9651e76461e9608e15a040fb3.tar.gz
+sha256 56e1dbd9826d932f0ef72a10dfdf32b6e0f680ab6830f8a8cfc60644ac69dbf1 expedite-e7b11dd328d9db82b49cde795944a721beaf0112.tar.gz
diff --git a/package/expedite/expedite.mk b/package/expedite/expedite.mk
index d49e87a..6bd4b00 100644
--- a/package/expedite/expedite.mk
+++ b/package/expedite/expedite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EXPEDITE_VERSION = 0529ce56b6fb01e9651e76461e9608e15a040fb3
+EXPEDITE_VERSION = e7b11dd328d9db82b49cde795944a721beaf0112
 EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git
 EXPEDITE_SITE_METHOD = git
 EXPEDITE_LICENSE = BSD-2-Clause
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH] libgpiod: bump version to 0.2
From: Bartosz Golaszewski @ 2017-05-10 16:25 UTC (permalink / raw)
  To: buildroot

New release adds a couple new features and improvements, although the
most important one - the test suite - doesn't really matter for
buildroot.

The project has also been relicensed under LGPLv2.1.

We need the m4 directory fixup now since the AC_CONFIG_MACRO_DIRS([m4])
macro was used in configure.ac, but we don't want to have unnecessary
files in the git repo.

New features:
- relicensed under LGPLv2.1
- implemented a unit testing framework together with a comprehensive
  set of test cases
- added a non-closing variant of the gpiochip iterator and foreach
  macro [by Clemens Gruber]
- added gpiod_chip_open_by_label()

Improvements:
- Makefiles & build commands have been reworked [by Thierry Reding]
- documentation updates
- code shrinkage here and there
- coding style fixes
- removed all designated initializers from the header for better standards
  compliance

Bug fixes:
- fix the return value of gpiod_simple_event_loop()
- don't try to process docs if doxygen is not installed

Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
 package/libgpiod/libgpiod.hash |  2 +-
 package/libgpiod/libgpiod.mk   | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash
index eee2a66..fcf212e 100644
--- a/package/libgpiod/libgpiod.hash
+++ b/package/libgpiod/libgpiod.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 670a13518fabf2a99f9e349c33d5421c2146eec15b73c5edef3f1981a7adaeda libgpiod-v0.1.3.tar.gz
+sha256 de1947f3cb2cc4174364af430309fe6238976658575655bdbd76c60cffa7df92 libgpiod-v0.2.tar.gz
diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk
index 0947a4a..c95ea44 100644
--- a/package/libgpiod/libgpiod.mk
+++ b/package/libgpiod/libgpiod.mk
@@ -4,10 +4,17 @@
 #
 ################################################################################
 
-LIBGPIOD_VERSION = v0.1.3
+LIBGPIOD_VERSION = v0.2
 LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION))
-LIBGPIOD_LICENSE = GPL-3.0+
+LIBGPIOD_LICENSE = LGPL-2.1+
 LIBGPIOD_LICENSE_FILES = COPYING
+
+# Needed for autoreconf to work properly
+define LIBGPIOD_FIXUP_M4_DIR
+        mkdir $(@D)/m4
+endef
+LIBGPIOD_POST_EXTRACT_HOOKS += LIBGPIOD_FIXUP_M4_DIR
+
 # fetched from github, no configure script provided
 LIBGPIOD_AUTORECONF = YES
 
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH next] libgtk3: bump version to 3.22.13
From: Vicente Olivert Riera @ 2017-05-10 14:35 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/libgtk3/libgtk3.hash | 4 ++--
 package/libgtk3/libgtk3.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash
index 10dcb4d..8e3979a 100644
--- a/package/libgtk3/libgtk3.hash
+++ b/package/libgtk3/libgtk3.hash
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.12.sha256sum
-sha256 84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c  gtk+-3.22.12.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.13.sha256sum
+sha256 575f45571fc7c0081ede9ba745b752514cd883c3b5f69cf5bee0a5ee11c6bee6  gtk+-3.22.13.tar.xz
diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index 1759953..8b0c7bb 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGTK3_VERSION_MAJOR = 3.22
-LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).12
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).13
 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
 LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
 LIBGTK3_LICENSE = LGPL-2.0+
-- 
2.10.2

^ permalink raw reply related

* [Buildroot] [PATCH 1/1] swig: bump to 3.0.12
From: Matthew Weber @ 2017-05-10 13:59 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510130057.16408-1-aduskett@codeblue.com>

Adam,

On Wed, May 10, 2017 at 8:00 AM, Adam Duskett <aduskett@gmail.com> wrote:
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/swig/swig.hash | 2 +-
>  package/swig/swig.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/swig/swig.hash b/package/swig/swig.hash
> index 92ddc11..77c93a9 100644
> --- a/package/swig/swig.hash
> +++ b/package/swig/swig.hash
> @@ -1,2 +1,2 @@
>  # Locally computed:
> -sha256 2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c        swig-3.0.10.tar.gz
> +sha256 7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d        swig-3.0.12.tar.gz
> diff --git a/package/swig/swig.mk b/package/swig/swig.mk
> index 740b597..cdf9533 100644
> --- a/package/swig/swig.mk
> +++ b/package/swig/swig.mk
> @@ -5,7 +5,7 @@
>  ################################################################################
>
>  SWIG_VERSION_MAJOR = 3.0
> -SWIG_VERSION = $(SWIG_VERSION_MAJOR).10
> +SWIG_VERSION = $(SWIG_VERSION_MAJOR).12
>  SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
>  HOST_SWIG_DEPENDENCIES = host-bison
>  HOST_SWIG_CONF_OPTS = \


Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

^ permalink raw reply

* [Buildroot] [PATCH 1/1] audit: bump to 2.7.6
From: Matthew Weber @ 2017-05-10 13:59 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510130646.28741-1-aduskett@codeblue.com>

Adam,

On Wed, May 10, 2017 at 8:06 AM, Adam Duskett <aduskett@gmail.com> wrote:
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/audit/audit.hash | 2 +-
>  package/audit/audit.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/audit/audit.hash b/package/audit/audit.hash
> index 2ae8f99..7dd3e55 100644
> --- a/package/audit/audit.hash
> +++ b/package/audit/audit.hash
> @@ -1,2 +1,2 @@
>  #Locally computed
> -sha256 0441790794fd9375dbca598fa0ffb46c57ff37b3a24b94ffec0bbee3215cca09 audit-2.7.1.tar.gz
> +sha256 fa65289cffdc95a25bfbdba541f43ee1b12c707090a38fd027dcf9354b9014e7 audit-2.7.6.tar.gz
> diff --git a/package/audit/audit.mk b/package/audit/audit.mk
> index b94d0bf..95b6078 100644
> --- a/package/audit/audit.mk
> +++ b/package/audit/audit.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>
> -AUDIT_VERSION = 2.7.1
> +AUDIT_VERSION = 2.7.6
>  AUDIT_SITE = http://people.redhat.com/sgrubb/audit
>  AUDIT_LICENSE = GPL-2.0+ (programs), unclear (libraries)
>  AUDIT_LICENSE_FILES = COPYING


Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>

^ permalink raw reply

* [Buildroot] [PATCH v3 next] flex: bump version to 2.6.4
From: Vicente Olivert Riera @ 2017-05-10 13:51 UTC (permalink / raw)
  To: buildroot

- 0001 patch removed. It doesn't apply on this version and is also not
  necessary since the AR binary is now handled correctly with AR = @AR at .
- 0002 patch removed. It's already included in this release:
  https://github.com/westes/flex/commit/a5cbe929ac3255d371e698f62dc256afe7006466
- The flex project has moved to GitHub, so modify the URLs in both
  flex.mk and Config.in files.
- The sed command over Makefile.in to prevent the flex binary to be
  built fails, so remove it. That logic has been moved to
  src/Makefile.in, and whenever we disable the flex binary to be built
  then the compilation fails when building the documentation because
  some bits require "../src/flex", which is the flex binary.
  We prevent building the flex binary and the documentation using a new
  patch.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v2 -> v3:
 - Add a new patch to prevent the flex binary and the documentation to
   be built.
 - Restore the hook for removing the broken flex++ symlink.
Changes v1 -> v2:
 - Do not offer the possibility to decide if we want the flex binary
   installed on the target. Instead of that, remove it unconditionally.
---
 ...lex-disable-flex-binary-and-documentation.patch | 35 ++++++++++++++++++++++
 package/flex/0001-prog-ar.patch                    | 11 -------
 package/flex/0002-fix-CVE-2016-6354.patch          | 25 ----------------
 package/flex/Config.in                             |  2 +-
 package/flex/flex.hash                             |  2 +-
 package/flex/flex.mk                               |  9 ++----
 6 files changed, 39 insertions(+), 45 deletions(-)
 create mode 100644 package/flex/0001-flex-disable-flex-binary-and-documentation.patch
 delete mode 100644 package/flex/0001-prog-ar.patch
 delete mode 100644 package/flex/0002-fix-CVE-2016-6354.patch

diff --git a/package/flex/0001-flex-disable-flex-binary-and-documentation.patch b/package/flex/0001-flex-disable-flex-binary-and-documentation.patch
new file mode 100644
index 0000000..d035ef4
--- /dev/null
+++ b/package/flex/0001-flex-disable-flex-binary-and-documentation.patch
@@ -0,0 +1,35 @@
+flex: prevent flex binary to be built
+
+Since we prevent the flex binary to be built, we also need to prevent
+the documentation to be built, otherwise it will fail like this:
+
+Making all in doc
+make[2]: Entering directory '/br/output/build/flex-2.6.4/doc'
+make[2]: *** No rule to make target '../src/flex', needed by 'flex.1'.
+Stop.
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2017-05-06 15:49:09.000000000 +0100
++++ b/Makefile.in	2017-05-10 14:35:20.152794902 +0100
+@@ -450,7 +450,6 @@ EXTRA_DIST = \
+ 
+ SUBDIRS = \
+ 	src \
+-	doc \
+ 	examples \
+ 	po \
+ 	tests \
+diff -rup a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in	2017-05-06 15:49:09.000000000 +0100
++++ b/src/Makefile.in	2017-05-10 14:35:01.918464036 +0100
+@@ -90,7 +90,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-bin_PROGRAMS = flex$(EXEEXT)
++bin_PROGRAMS =
+ @ENABLE_BOOTSTRAP_TRUE at noinst_PROGRAMS = stage1flex$(EXEEXT)
+ @CROSS_TRUE at am__append_1 = \
+ @CROSS_TRUE@		      ../lib/malloc.c \
diff --git a/package/flex/0001-prog-ar.patch b/package/flex/0001-prog-ar.patch
deleted file mode 100644
index e0626ff..0000000
--- a/package/flex/0001-prog-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
---- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
-+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =
diff --git a/package/flex/0002-fix-CVE-2016-6354.patch b/package/flex/0002-fix-CVE-2016-6354.patch
deleted file mode 100644
index b0c780b..0000000
--- a/package/flex/0002-fix-CVE-2016-6354.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00 2001
-From: Will Estes <westes575@gmail.com>
-Date: Sat, 27 Feb 2016 11:56:05 -0500
-Subject: [PATCH] Fixed incorrect integer type
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: upstream
-
- flex.skl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/flex.skl b/src/flex.skl
-index 36a526a..64f853d 100644
---- a/flex.skl
-+++ b/flex.skl
-@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer()
- 
- 	else
- 		{
--			yy_size_t num_to_read =
-+			int num_to_read =
- 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
- 
- 		while ( num_to_read <= 0 )
diff --git a/package/flex/Config.in b/package/flex/Config.in
index 0a70a1c..76e8bc7 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_FLEX
 	  A fast lexical analyser generator. A tool for generating
 	  programs that perform pattern-matching on text.
 
-	  http://flex.sourceforge.net/
+	  https://github.com/westes/flex/
diff --git a/package/flex/flex.hash b/package/flex/flex.hash
index b91ab57..cf2ce85 100644
--- a/package/flex/flex.hash
+++ b/package/flex/flex.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3  flex-2.5.37.tar.gz
+sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995  flex-2.6.4.tar.gz
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 9a3f840..81cbdc1 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-FLEX_VERSION = 2.5.37
-FLEX_SITE = http://download.sourceforge.net/project/flex
+FLEX_VERSION = 2.6.4
+FLEX_SITE = https://github.com/westes/flex/files/981163
 FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
@@ -15,11 +15,6 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES = host-m4
 
-define FLEX_DISABLE_PROGRAM
-	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
-endef
-FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
-
 # flex++ symlink is broken when flex binary is not installed
 define FLEX_REMOVE_BROKEN_SYMLINK
 	rm -f $(TARGET_DIR)/usr/bin/flex++
-- 
2.10.2

^ permalink raw reply related

* [Buildroot] [PATCH v2 next] flex: bump version to 2.6.4
From: Vicente Olivert Riera @ 2017-05-10 13:12 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510140308.3e7041f9@free-electrons.com>

Hi Thomas,

On 10/05/17 13:03, Thomas Petazzoni wrote:
> Hello,
> 
> On Wed, 10 May 2017 12:31:23 +0100, Vicente Olivert Riera wrote:
> 
>> - The sed command over Makefile.in to prevent the flex binary to be
>>   built fails, so remove it. Instead, just remove the flex binary and
>>   its flex++ symlink using a post-target-install hook.
> 
> Have you tried to build this with a noMMU toolchain? I believe it will
> fail to build, because the flex program uses fork().

you're right, it fails to build with a noMMU toolchain because of fork():

flex-filter.o: In function `filter_apply_chain':
filter.c:(.text+0x1bc): undefined reference to `fork'

So, either we make flex package depend on MMU, or we prevent the flex
binary to be compiled. I prefer the second option.

I'll try to see how we can do it.

Regards,

Vincent.

> 
> Thomas
> 

^ permalink raw reply

* [Buildroot] [PATCH 1/1] audit: bump to 2.7.6
From: Adam Duskett @ 2017-05-10 13:06 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
 package/audit/audit.hash | 2 +-
 package/audit/audit.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/audit/audit.hash b/package/audit/audit.hash
index 2ae8f99..7dd3e55 100644
--- a/package/audit/audit.hash
+++ b/package/audit/audit.hash
@@ -1,2 +1,2 @@
 #Locally computed
-sha256 0441790794fd9375dbca598fa0ffb46c57ff37b3a24b94ffec0bbee3215cca09 audit-2.7.1.tar.gz
+sha256 fa65289cffdc95a25bfbdba541f43ee1b12c707090a38fd027dcf9354b9014e7 audit-2.7.6.tar.gz
diff --git a/package/audit/audit.mk b/package/audit/audit.mk
index b94d0bf..95b6078 100644
--- a/package/audit/audit.mk
+++ b/package/audit/audit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUDIT_VERSION = 2.7.1
+AUDIT_VERSION = 2.7.6
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
 AUDIT_LICENSE = GPL-2.0+ (programs), unclear (libraries)
 AUDIT_LICENSE_FILES = COPYING
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH 1/1] swig: bump to 3.0.12
From: Adam Duskett @ 2017-05-10 13:00 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
---
 package/swig/swig.hash | 2 +-
 package/swig/swig.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/swig/swig.hash b/package/swig/swig.hash
index 92ddc11..77c93a9 100644
--- a/package/swig/swig.hash
+++ b/package/swig/swig.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256	2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c	swig-3.0.10.tar.gz
+sha256	7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d	swig-3.0.12.tar.gz
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 740b597..cdf9533 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 SWIG_VERSION_MAJOR = 3.0
-SWIG_VERSION = $(SWIG_VERSION_MAJOR).10
+SWIG_VERSION = $(SWIG_VERSION_MAJOR).12
 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
 HOST_SWIG_DEPENDENCIES = host-bison
 HOST_SWIG_CONF_OPTS = \
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 next] flex: bump version to 2.6.4
From: Thomas Petazzoni @ 2017-05-10 12:03 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510113123.36929-1-Vincent.Riera@imgtec.com>

Hello,

On Wed, 10 May 2017 12:31:23 +0100, Vicente Olivert Riera wrote:

> - The sed command over Makefile.in to prevent the flex binary to be
>   built fails, so remove it. Instead, just remove the flex binary and
>   its flex++ symlink using a post-target-install hook.

Have you tried to build this with a noMMU toolchain? I believe it will
fail to build, because the flex program uses fork().

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply

* [Buildroot] [PATCH master] mpir: fix build on MIPS R6 CPUs
From: Thomas Petazzoni @ 2017-05-10 12:00 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510105546.51108-1-Vincent.Riera@imgtec.com>

Hello,

On Wed, 10 May 2017 11:55:46 +0100, Vicente Olivert Riera wrote:
> Commit ef9eebf65f554d9aacfd420600c8ba17787151a8 tried to fix this
> problem in a wrong way. It was fixed only for generic R6 CPUs, so the
> problem still persist if you choose any other R6 CPU, like I6400 for
> instance.
> 
> Fix it properly by using the right kconfig options.
> 
> Fixes:
>   http://autobuild.buildroot.net/results/f33/f33cb1e0b49fe8aee68fb4b66ea4c304b71a6f8f/
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Thanks!
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply

* [Buildroot] [PATCH v2 next] flex: bump version to 2.6.4
From: Vicente Olivert Riera @ 2017-05-10 11:31 UTC (permalink / raw)
  To: buildroot

- 0001 patch removed. It doesn't apply on this version and is also not
  necessary since the AR binary is now handled correctly with AR = @AR at .
- 0002 patch removed. It's already included in this release:
  https://github.com/westes/flex/commit/a5cbe929ac3255d371e698f62dc256afe7006466
- The flex project has moved to GitHub, so modify the URLs in both
  flex.mk and Config.in files.
- The sed command over Makefile.in to prevent the flex binary to be
  built fails, so remove it. Instead, just remove the flex binary and
  its flex++ symlink using a post-target-install hook.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v1 -> v2:
 - Do not offer the possibility to decide if we want the flex binary
   installed on the target. Instead of that, remove it unconditionally.
---
 package/flex/0001-prog-ar.patch           | 11 -----------
 package/flex/0002-fix-CVE-2016-6354.patch | 25 -------------------------
 package/flex/Config.in                    |  2 +-
 package/flex/flex.hash                    |  2 +-
 package/flex/flex.mk                      | 17 +++++++----------
 5 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 package/flex/0001-prog-ar.patch
 delete mode 100644 package/flex/0002-fix-CVE-2016-6354.patch

diff --git a/package/flex/0001-prog-ar.patch b/package/flex/0001-prog-ar.patch
deleted file mode 100644
index e0626ff..0000000
--- a/package/flex/0001-prog-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
---- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
-+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =
diff --git a/package/flex/0002-fix-CVE-2016-6354.patch b/package/flex/0002-fix-CVE-2016-6354.patch
deleted file mode 100644
index b0c780b..0000000
--- a/package/flex/0002-fix-CVE-2016-6354.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00 2001
-From: Will Estes <westes575@gmail.com>
-Date: Sat, 27 Feb 2016 11:56:05 -0500
-Subject: [PATCH] Fixed incorrect integer type
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: upstream
-
- flex.skl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/flex.skl b/src/flex.skl
-index 36a526a..64f853d 100644
---- a/flex.skl
-+++ b/flex.skl
-@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer()
- 
- 	else
- 		{
--			yy_size_t num_to_read =
-+			int num_to_read =
- 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
- 
- 		while ( num_to_read <= 0 )
diff --git a/package/flex/Config.in b/package/flex/Config.in
index 0a70a1c..76e8bc7 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_FLEX
 	  A fast lexical analyser generator. A tool for generating
 	  programs that perform pattern-matching on text.
 
-	  http://flex.sourceforge.net/
+	  https://github.com/westes/flex/
diff --git a/package/flex/flex.hash b/package/flex/flex.hash
index b91ab57..cf2ce85 100644
--- a/package/flex/flex.hash
+++ b/package/flex/flex.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3  flex-2.5.37.tar.gz
+sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995  flex-2.6.4.tar.gz
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 9a3f840..f521192 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-FLEX_VERSION = 2.5.37
-FLEX_SITE = http://download.sourceforge.net/project/flex
+FLEX_VERSION = 2.6.4
+FLEX_SITE = https://github.com/westes/flex/files/981163
 FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
@@ -15,16 +15,13 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES = host-m4
 
-define FLEX_DISABLE_PROGRAM
-	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
-endef
-FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
-
-# flex++ symlink is broken when flex binary is not installed
-define FLEX_REMOVE_BROKEN_SYMLINK
+# Remove flex binary and its flex++ symlink. Is essentially a development tool
+# which isn't very useful in the target.
+define FLEX_REMOVE_FLEX_BINARY
+	rm -f $(TARGET_DIR)/usr/bin/flex
 	rm -f $(TARGET_DIR)/usr/bin/flex++
 endef
-FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
+FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_FLEX_BINARY
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.10.2

^ permalink raw reply related

* [Buildroot] [PATCH 1/1] flex: bump to version v2.6.4
From: Vicente Olivert Riera @ 2017-05-10 11:26 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <1494415079.2665.1.camel@codeblue.com>

Hi Adam,

On 10/05/17 12:17, Adam Duskett wrote:
> Hey Vicente;
> 
> On Wed, 2017-05-10 at 12:12 +0100, Vicente Olivert Riera wrote:
>> Hello Adam,
>>
>> I already sent a patch to bump flex to 2.6.4 a couple of days ago.
>> Could
>> you please review my patch instead?
>>
>> http://patchwork.ozlabs.org/patch/759619/
>>
> Sure can!
> 
> A quick check indicates that adding BR2_PACKAGE_FLEX_BINARY triggers a
> legacy build option failure: "flex binary in target option removed"

Uhm..., true, it looks they don't want a flex binary on target. Not even
give the opportunity to the user to decide that. I'll send a v2 without
that part.

Thanks!

Vincent

> Other than that, it looks to work better than my patch.
> 
> Adam
> 
>> Thanks,
>>
>> Vincent
>>
>> On 10/05/17 12:06, Adam Duskett wrote:
>>> flex.mk:
>>>   - The package is now hosted on github not sourceforge.
>>>   - autogen.sh is now used, set FLEX_AUTORECONF to YES.
>>>   - host-gettext is now required. Without it autoconf fails to run.
>>>     This is both with host-flex and target-flex.
>>>   - The FLEX_DISABLE_PROGRAM define in the makefile has been
>>> removed,
>>>     as the only reference to bin_PROGRAMS is now just flex.
>>>   - The flex++ symlink is now only generated if the flex binary is
>>>     installed. As such, FLEX_REMOVE_BROKEN_SYMLINK is no longer
>>> needed.
>>>   - Add FLEX_TOUCH_RPATH_CONF define in flex.mk.  Autogen.sh fails
>>> if
>>>     build-aux/config.rpath doesn't exist. Touching it fixes the
>>> problem.
>>>
>>> - Removed 0001-prog-ar.patch, fixed upstream.
>>> - Removed 0002-fix-CVE-2016-6354.patch, applied upstream.
>>>
>>> 0001-fix-cross-compiling-issues.patch:
>>>   - doc requires help2man which isn't supported, and documents
>>> aren't
>>>     needed anyways.
>>>   - po doesn't have a makefile, and isn't needed for compiling.
>>>
>>> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
>>> ---
>>>  package/flex/0001-fix-cross-compiling-issues.patch | 49
>>> ++++++++++++++++++++++
>>>  package/flex/0001-prog-ar.patch                    | 11 -----
>>>  package/flex/0002-fix-CVE-2016-6354.patch          | 25 ----------
>>> -
>>>  package/flex/flex.hash                             |  2 +-
>>>  package/flex/flex.mk                               | 26 +++++-----
>>> --
>>>  5 files changed, 61 insertions(+), 52 deletions(-)
>>>  create mode 100644 package/flex/0001-fix-cross-compiling-
>>> issues.patch
>>>  delete mode 100644 package/flex/0001-prog-ar.patch
>>>  delete mode 100644 package/flex/0002-fix-CVE-2016-6354.patch
>>>
>>> diff --git a/package/flex/0001-fix-cross-compiling-issues.patch
>>> b/package/flex/0001-fix-cross-compiling-issues.patch
>>> new file mode 100644
>>> index 0000000..ef092c5
>>> --- /dev/null
>>> +++ b/package/flex/0001-fix-cross-compiling-issues.patch
>>> @@ -0,0 +1,49 @@
>>> +From 31985a4183654c884240c3740f8a24212f8794c2 Mon Sep 17 00:00:00
>>> 2001
>>> +From: Adam Duskett <aduskett@codeblue.com>
>>> +Date: Tue, 9 May 2017 13:46:18 -0400
>>> +Subject: [PATCH] fix cross compiling issues
>>> +
>>> +the po directory doesn't have a makefile.
>>> +doc wants help2man that isn't supported by buildroot.
>>> +
>>> +Remove both of these references.
>>> +
>>> +Signed-off-by: Adam Duskett <aduskett@codeblue.com>
>>> +---
>>> + Makefile.am  | 2 --
>>> + configure.ac | 2 --
>>> + 2 files changed, 4 deletions(-)
>>> +
>>> +diff --git a/Makefile.am b/Makefile.am
>>> +index 638c549..8b7fbc4 100644
>>> +--- a/Makefile.am
>>> ++++ b/Makefile.am
>>> +@@ -43,9 +43,7 @@ EXTRA_DIST = \
>>> + 
>>> + SUBDIRS = \
>>> + 	src \
>>> +-	doc \
>>> + 	examples \
>>> +-	po \
>>> + 	tests \
>>> + 	tools
>>> + 
>>> +diff --git a/configure.ac b/configure.ac
>>> +index 55e774b..6c56c36 100644
>>> +--- a/configure.ac
>>> ++++ b/configure.ac
>>> +@@ -171,11 +171,9 @@ reallocarray dnl  OpenBSD function. We have
>>> replacement if not available.
>>> + 
>>> + AC_CONFIG_FILES(
>>> + Makefile
>>> +-doc/Makefile
>>> + examples/Makefile
>>> + examples/fastwc/Makefile
>>> + examples/manual/Makefile
>>> +-po/Makefile.in
>>> + src/Makefile
>>> + tools/Makefile
>>> + tests/Makefile
>>> +-- 
>>> +2.9.3
>>> +
>>> diff --git a/package/flex/0001-prog-ar.patch b/package/flex/0001-
>>> prog-ar.patch
>>> deleted file mode 100644
>>> index e0626ff..0000000
>>> --- a/package/flex/0001-prog-ar.patch
>>> +++ /dev/null
>>> @@ -1,11 +0,0 @@
>>> -diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
>>> ---- flex-2.5.33.orig/Makefile.in	2007-01-18
>>> 17:29:25.000000000 +0100
>>> -+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000
>>> +0100
>>> -@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
>>> - 	"$(DESTDIR)$(includedir)"
>>> - libLIBRARIES_INSTALL = $(INSTALL_DATA)
>>> - LIBRARIES = $(lib_LIBRARIES)
>>> --AR = ar
>>> - ARFLAGS = cru
>>> - libfl_a_AR = $(AR) $(ARFLAGS)
>>> - libfl_a_LIBADD =
>>> diff --git a/package/flex/0002-fix-CVE-2016-6354.patch
>>> b/package/flex/0002-fix-CVE-2016-6354.patch
>>> deleted file mode 100644
>>> index b0c780b..0000000
>>> --- a/package/flex/0002-fix-CVE-2016-6354.patch
>>> +++ /dev/null
>>> @@ -1,25 +0,0 @@
>>> -From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Will Estes <westes575@gmail.com>
>>> -Date: Sat, 27 Feb 2016 11:56:05 -0500
>>> -Subject: [PATCH] Fixed incorrect integer type
>>> -
>>> -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>>> ----
>>> -Status: upstream
>>> -
>>> - flex.skl | 2 +-
>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>> -
>>> -diff --git a/src/flex.skl b/src/flex.skl
>>> -index 36a526a..64f853d 100644
>>> ---- a/flex.skl
>>> -+++ b/flex.skl
>>> -@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer()
>>> - 
>>> - 	else
>>> - 		{
>>> --			yy_size_t num_to_read =
>>> -+			int num_to_read =
>>> - 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
>>> number_to_move - 1;
>>> - 
>>> - 		while ( num_to_read <= 0 )
>>> diff --git a/package/flex/flex.hash b/package/flex/flex.hash
>>> index b91ab57..fc0463d 100644
>>> --- a/package/flex/flex.hash
>>> +++ b/package/flex/flex.hash
>>> @@ -1,2 +1,2 @@
>>>  # Locally computed:
>>> -sha256  bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86
>>> 088dd3  flex-2.5.37.tar.gz
>>> +sha256  4df278468142e457a9e5f6492a7d39fdb34bd7e7d42ec21b3c382889b3
>>> 4cfefe  flex-v2.6.4.tar.gz
>>> diff --git a/package/flex/flex.mk b/package/flex/flex.mk
>>> index 9a3f840..0613c89 100644
>>> --- a/package/flex/flex.mk
>>> +++ b/package/flex/flex.mk
>>> @@ -4,27 +4,23 @@
>>>  #
>>>  ##################################################################
>>> ##############
>>>  
>>> -FLEX_VERSION = 2.5.37
>>> -FLEX_SITE = http://download.sourceforge.net/project/flex
>>> +FLEX_VERSION = v2.6.4
>>> +FLEX_SITE = $(call github,westes,flex,$(FLEX_VERSION))
>>>  FLEX_INSTALL_STAGING = YES
>>>  FLEX_LICENSE = FLEX
>>>  FLEX_LICENSE_FILES = COPYING
>>> -FLEX_DEPENDENCIES = \
>>> -	$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
>>> -FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
>>> -# we don't have a host-gettext/libintl
>>> -HOST_FLEX_DEPENDENCIES = host-m4
>>> +FLEX_DEPENDENCIES = host-m4 host-gettext
>>> +FLEX_AUTORECONF = YES
>>> +HOST_FLEX_DEPENDENCIES = host-gettext host-m4
>>>  
>>> -define FLEX_DISABLE_PROGRAM
>>> -	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
>>> +# build-aux/config.rpath is needed but not auto-generated.
>>> +define FLEX_TOUCH_RPATH_CONF
>>> +	mkdir -p $(@D)/build-aux
>>> +	touch $(@D)/build-aux/config.rpath
>>>  endef
>>> -FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
>>>  
>>> -# flex++ symlink is broken when flex binary is not installed
>>> -define FLEX_REMOVE_BROKEN_SYMLINK
>>> -	rm -f $(TARGET_DIR)/usr/bin/flex++
>>> -endef
>>> -FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
>>> +FLEX_PRE_CONFIGURE_HOOKS += FLEX_TOUCH_RPATH_CONF
>>> +HOST_FLEX_PRE_CONFIGURE_HOOKS += FLEX_TOUCH_RPATH_CONF
>>>  
>>>  $(eval $(autotools-package))
>>>  $(eval $(host-autotools-package))

^ permalink raw reply

* [Buildroot] [PATCH 1/1] flex: bump to version v2.6.4
From: Vicente Olivert Riera @ 2017-05-10 11:12 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510110643.17926-1-aduskett@codeblue.com>

Hello Adam,

I already sent a patch to bump flex to 2.6.4 a couple of days ago. Could
you please review my patch instead?

http://patchwork.ozlabs.org/patch/759619/

Thanks,

Vincent

On 10/05/17 12:06, Adam Duskett wrote:
> flex.mk:
>   - The package is now hosted on github not sourceforge.
>   - autogen.sh is now used, set FLEX_AUTORECONF to YES.
>   - host-gettext is now required. Without it autoconf fails to run.
>     This is both with host-flex and target-flex.
>   - The FLEX_DISABLE_PROGRAM define in the makefile has been removed,
>     as the only reference to bin_PROGRAMS is now just flex.
>   - The flex++ symlink is now only generated if the flex binary is
>     installed. As such, FLEX_REMOVE_BROKEN_SYMLINK is no longer needed.
>   - Add FLEX_TOUCH_RPATH_CONF define in flex.mk.  Autogen.sh fails if
>     build-aux/config.rpath doesn't exist. Touching it fixes the problem.
> 
> - Removed 0001-prog-ar.patch, fixed upstream.
> - Removed 0002-fix-CVE-2016-6354.patch, applied upstream.
> 
> 0001-fix-cross-compiling-issues.patch:
>   - doc requires help2man which isn't supported, and documents aren't
>     needed anyways.
>   - po doesn't have a makefile, and isn't needed for compiling.
> 
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/flex/0001-fix-cross-compiling-issues.patch | 49 ++++++++++++++++++++++
>  package/flex/0001-prog-ar.patch                    | 11 -----
>  package/flex/0002-fix-CVE-2016-6354.patch          | 25 -----------
>  package/flex/flex.hash                             |  2 +-
>  package/flex/flex.mk                               | 26 +++++-------
>  5 files changed, 61 insertions(+), 52 deletions(-)
>  create mode 100644 package/flex/0001-fix-cross-compiling-issues.patch
>  delete mode 100644 package/flex/0001-prog-ar.patch
>  delete mode 100644 package/flex/0002-fix-CVE-2016-6354.patch
> 
> diff --git a/package/flex/0001-fix-cross-compiling-issues.patch b/package/flex/0001-fix-cross-compiling-issues.patch
> new file mode 100644
> index 0000000..ef092c5
> --- /dev/null
> +++ b/package/flex/0001-fix-cross-compiling-issues.patch
> @@ -0,0 +1,49 @@
> +From 31985a4183654c884240c3740f8a24212f8794c2 Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@codeblue.com>
> +Date: Tue, 9 May 2017 13:46:18 -0400
> +Subject: [PATCH] fix cross compiling issues
> +
> +the po directory doesn't have a makefile.
> +doc wants help2man that isn't supported by buildroot.
> +
> +Remove both of these references.
> +
> +Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> +---
> + Makefile.am  | 2 --
> + configure.ac | 2 --
> + 2 files changed, 4 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 638c549..8b7fbc4 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -43,9 +43,7 @@ EXTRA_DIST = \
> + 
> + SUBDIRS = \
> + 	src \
> +-	doc \
> + 	examples \
> +-	po \
> + 	tests \
> + 	tools
> + 
> +diff --git a/configure.ac b/configure.ac
> +index 55e774b..6c56c36 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -171,11 +171,9 @@ reallocarray dnl  OpenBSD function. We have replacement if not available.
> + 
> + AC_CONFIG_FILES(
> + Makefile
> +-doc/Makefile
> + examples/Makefile
> + examples/fastwc/Makefile
> + examples/manual/Makefile
> +-po/Makefile.in
> + src/Makefile
> + tools/Makefile
> + tests/Makefile
> +-- 
> +2.9.3
> +
> diff --git a/package/flex/0001-prog-ar.patch b/package/flex/0001-prog-ar.patch
> deleted file mode 100644
> index e0626ff..0000000
> --- a/package/flex/0001-prog-ar.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
> ---- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
> -+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
> -@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
> - 	"$(DESTDIR)$(includedir)"
> - libLIBRARIES_INSTALL = $(INSTALL_DATA)
> - LIBRARIES = $(lib_LIBRARIES)
> --AR = ar
> - ARFLAGS = cru
> - libfl_a_AR = $(AR) $(ARFLAGS)
> - libfl_a_LIBADD =
> diff --git a/package/flex/0002-fix-CVE-2016-6354.patch b/package/flex/0002-fix-CVE-2016-6354.patch
> deleted file mode 100644
> index b0c780b..0000000
> --- a/package/flex/0002-fix-CVE-2016-6354.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00 2001
> -From: Will Estes <westes575@gmail.com>
> -Date: Sat, 27 Feb 2016 11:56:05 -0500
> -Subject: [PATCH] Fixed incorrect integer type
> -
> -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ----
> -Status: upstream
> -
> - flex.skl | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/src/flex.skl b/src/flex.skl
> -index 36a526a..64f853d 100644
> ---- a/flex.skl
> -+++ b/flex.skl
> -@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer()
> - 
> - 	else
> - 		{
> --			yy_size_t num_to_read =
> -+			int num_to_read =
> - 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
> - 
> - 		while ( num_to_read <= 0 )
> diff --git a/package/flex/flex.hash b/package/flex/flex.hash
> index b91ab57..fc0463d 100644
> --- a/package/flex/flex.hash
> +++ b/package/flex/flex.hash
> @@ -1,2 +1,2 @@
>  # Locally computed:
> -sha256  bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3  flex-2.5.37.tar.gz
> +sha256  4df278468142e457a9e5f6492a7d39fdb34bd7e7d42ec21b3c382889b34cfefe  flex-v2.6.4.tar.gz
> diff --git a/package/flex/flex.mk b/package/flex/flex.mk
> index 9a3f840..0613c89 100644
> --- a/package/flex/flex.mk
> +++ b/package/flex/flex.mk
> @@ -4,27 +4,23 @@
>  #
>  ################################################################################
>  
> -FLEX_VERSION = 2.5.37
> -FLEX_SITE = http://download.sourceforge.net/project/flex
> +FLEX_VERSION = v2.6.4
> +FLEX_SITE = $(call github,westes,flex,$(FLEX_VERSION))
>  FLEX_INSTALL_STAGING = YES
>  FLEX_LICENSE = FLEX
>  FLEX_LICENSE_FILES = COPYING
> -FLEX_DEPENDENCIES = \
> -	$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
> -FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
> -# we don't have a host-gettext/libintl
> -HOST_FLEX_DEPENDENCIES = host-m4
> +FLEX_DEPENDENCIES = host-m4 host-gettext
> +FLEX_AUTORECONF = YES
> +HOST_FLEX_DEPENDENCIES = host-gettext host-m4
>  
> -define FLEX_DISABLE_PROGRAM
> -	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
> +# build-aux/config.rpath is needed but not auto-generated.
> +define FLEX_TOUCH_RPATH_CONF
> +	mkdir -p $(@D)/build-aux
> +	touch $(@D)/build-aux/config.rpath
>  endef
> -FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
>  
> -# flex++ symlink is broken when flex binary is not installed
> -define FLEX_REMOVE_BROKEN_SYMLINK
> -	rm -f $(TARGET_DIR)/usr/bin/flex++
> -endef
> -FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
> +FLEX_PRE_CONFIGURE_HOOKS += FLEX_TOUCH_RPATH_CONF
> +HOST_FLEX_PRE_CONFIGURE_HOOKS += FLEX_TOUCH_RPATH_CONF
>  
>  $(eval $(autotools-package))
>  $(eval $(host-autotools-package))
> 

^ permalink raw reply

* [Buildroot] [PATCH 1/1] flex: bump to version v2.6.4
From: Baruch Siach @ 2017-05-10 11:12 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510110643.17926-1-aduskett@codeblue.com>

Hi Adam,

On Wed, May 10, 2017 at 07:06:43AM -0400, Adam Duskett wrote:
> diff --git a/package/flex/0001-fix-cross-compiling-issues.patch 
> b/package/flex/0001-fix-cross-compiling-issues.patch
> new file mode 100644
> index 0000000..ef092c5
> --- /dev/null
> +++ b/package/flex/0001-fix-cross-compiling-issues.patch
> @@ -0,0 +1,49 @@
> +From 31985a4183654c884240c3740f8a24212f8794c2 Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@codeblue.com>
> +Date: Tue, 9 May 2017 13:46:18 -0400
> +Subject: [PATCH] fix cross compiling issues
> +
> +the po directory doesn't have a makefile.
> +doc wants help2man that isn't supported by buildroot.

The problem with help2man is that it is inherently incompatible with cross 
compilation. help2man relies on the ability to run the built binary.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply

* [Buildroot] [PATCH next 3/3] tcpreplay: bump version to 4.2.5
From: Vicente Olivert Riera @ 2017-05-10 11:09 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510110910.27889-1-Vincent.Riera@imgtec.com>

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/tcpreplay/tcpreplay.hash | 2 +-
 package/tcpreplay/tcpreplay.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash
index 9e8d151..c908964 100644
--- a/package/tcpreplay/tcpreplay.hash
+++ b/package/tcpreplay/tcpreplay.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256 da78ea1a1fe8ff177a4f9e71c4c6739b79ac86db2c2bb90955318b8e8439beb7  tcpreplay-4.2.4.tar.gz
+sha256 941026be34e1db5101d3d22ebddd6fff76179a1ee81e273338f533ba4eca89d7  tcpreplay-4.2.5.tar.gz
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 879f518..d303c60 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TCPREPLAY_VERSION = 4.2.4
+TCPREPLAY_VERSION = 4.2.5
 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
 TCPREPLAY_LICENSE = GPL-3.0
 TCPREPLAY_LICENSE_FILES = docs/LICENSE
-- 
2.10.2

^ permalink raw reply related

* [Buildroot] [PATCH next 2/3] cjson: bump version to v1.5.2
From: Vicente Olivert Riera @ 2017-05-10 11:09 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170510110910.27889-1-Vincent.Riera@imgtec.com>

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/cjson/cjson.hash | 2 +-
 package/cjson/cjson.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash
index 09cc335..14853da 100644
--- a/package/cjson/cjson.hash
+++ b/package/cjson/cjson.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 81e6574f0b1c0d7cd34fa5e0f3fd34b162fc1c568fc1473880999c2030bfb6f0  cjson-v1.5.1.tar.gz
+sha256 6d1482c1b492893b25ab7e77ee6098fe3ef10585df660e5ffe67e632a8c5b9e4  cjson-v1.5.2.tar.gz
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 43cd8bd..c0f4b98 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CJSON_VERSION = v1.5.1
+CJSON_VERSION = v1.5.2
 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE = MIT
-- 
2.10.2

^ permalink raw reply related


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox