[ptxdist] [PATCH] canfestival: Two new patches that make canfestival headers more robust

[Uwe Kleine-König]

Signed-off-by: Uwe Kleine-König 
---
 ...4-let-canfestival.h-include-config.h.patch |  39 ++
 -instead-of-include-.-for-own-files.patch | 118 ++
 patches/canfestival-3+hg20180126.794/series   |   4 +-
 3 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 
patches/canfestival-3+hg20180126.794/0004-let-canfestival.h-include-config.h.patch
 create mode 100644 
patches/canfestival-3+hg20180126.794/0005-Use-include-.-instead-of-include-.-for-own-files.patch

diff --git 
a/patches/canfestival-3+hg20180126.794/0004-let-canfestival.h-include-config.h.patch
 
b/patches/canfestival-3+hg20180126.794/0004-let-canfestival.h-include-config.h.patch
new file mode 100644
index ..c6b005703e03
--- /dev/null
+++ 
b/patches/canfestival-3+hg20180126.794/0004-let-canfestival.h-include-config.h.patch
@@ -0,0 +1,39 @@
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 
+Date: Mon, 29 Jan 2018 14:07:18 +0100
+Subject: [PATCH] let canfestival.h include config.h
+
+This is necessary to make the header self-contained. Otherwise it is necessary 
to do
+
+   #include 
+   #include 
+
+in the API user which might pull in a local config.h.
+---
+ include/sdo.h  | 1 +
+ include/unix/canfestival.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/include/sdo.h b/include/sdo.h
+index 28b8c5c414eb..7863bb5c05a0 100644
+--- a/include/sdo.h
 b/include/sdo.h
+@@ -36,6 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
+ 
+ struct struct_s_transfer;
+ 
++#include "config.h"
+ #include "timer.h"
+ 
+ /* Block mode : Data consumer receive step 
+diff --git a/include/unix/canfestival.h b/include/unix/canfestival.h
+index f20e593dcf89..ee2a0bc0c4ae 100755
+--- a/include/unix/canfestival.h
 b/include/unix/canfestival.h
+@@ -5,6 +5,7 @@
+ extern "C" {
+ #endif
+ 
++#include "config.h"
+ #include "timerscfg.h"
+ #include "can_driver.h"
+ #include "data.h"
diff --git 
a/patches/canfestival-3+hg20180126.794/0005-Use-include-.-instead-of-include-.-for-own-files.patch
 
b/patches/canfestival-3+hg20180126.794/0005-Use-include-.-instead-of-include-.-for-own-files.patch
new file mode 100644
index ..8feaa48a8416
--- /dev/null
+++ 
b/patches/canfestival-3+hg20180126.794/0005-Use-include-.-instead-of-include-.-for-own-files.patch
@@ -0,0 +1,118 @@
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 
+Date: Wed, 29 Apr 2020 22:54:55 +0200
+Subject: [PATCH] Use #include "..." instead of #include <...> for own files
+
+This fixes inclusion if the consumer used
+
+   #include 
+
+(and not -I/usr/include/canfestival) as with
+
+   #include <...>
+
+the local files are not found in this case.
+---
+ include/emcy.h | 2 +-
+ include/lifegrd.h  | 2 +-
+ include/nmtSlave.h | 2 +-
+ include/objacces.h | 2 +-
+ include/pdo.h  | 4 ++--
+ include/states.h   | 2 +-
+ include/timer.h| 4 ++--
+ 7 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/include/emcy.h b/include/emcy.h
+index d3a19eb6d335..ad7ce933eebd 100644
+--- a/include/emcy.h
 b/include/emcy.h
+@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
+ #define __emcy_h__
+ 
+ 
+-#include 
++#include "applicfg.h"
+ 
+ /* The error states 
+  * - */
+diff --git a/include/lifegrd.h b/include/lifegrd.h
+index a0600a717038..222a3dd18f73 100644
+--- a/include/lifegrd.h
 b/include/lifegrd.h
+@@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
+ #define __lifegrd_h__
+ 
+ 
+-#include 
++#include "applicfg.h"
+ 
+ typedef void (*heartbeatError_t)(CO_Data*, UNS8);
+ void _heartbeatError(CO_Data* d, UNS8 heartbeatID);
+diff --git a/include/nmtSlave.h b/include/nmtSlave.h
+index 0a57ae878364..ffb720194e15 100755
+--- a/include/nmtSlave.h
 b/include/nmtSlave.h
+@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
+ #ifndef __nmtSlave_h__
+ #define __nmtSlave_h__
+ 
+-#include 
++#include "applicfg.h"
+ #include "data.h"
+ 
+ /** 
+diff --git a/include/objacces.h b/include/objacces.h
+index 26a96542a4ca..05dd46d313d7 100755
+--- a/include/objacces.h
 b/include/objacces.h
+@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
+ #ifndef __objacces_h__
+ #define __objacces_h__
+ 
+-#include 
++#include "applicfg.h"
+ 
+ 
+ #ifdef __cplusplus
+diff --git a/include/pdo.h b/include/pdo.h
+index d276d51734fc..713167f50071 100755
+--- a/include/pdo.h
 b/include/pdo.h
+@@ -29,8 +29,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
+ #ifndef __pdo_h__
+ #define __pdo_h__
+ 
+-#include 
+-#include 
++#include "applicfg.h"
++#include "def.h"
+ 
+ #include "can.h"
+ 
+diff --git a/include/states.h b/include/states.h
+index 6615a3debe02..804267113bd6 100644
+--- a/include/states.h
 b/include/states.h
+@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  

[ptxdist] [PATCH v2] python: move to staging

[Roland Hieber]

Use of Python 2 has been widely discouraged for some years [citation
needed], and remaining users should start migrating to Python 3 [1].
Move Python 2 to staging to reflect that.

[1]: https://www.python.org/dev/peps/pep-0404/#id13

Signed-off-by: Roland Hieber 

--
v2:
 - adapt removal date after final python v2.7.18 release
 - only move the python package for now. all reverse dependencies will
   depend on STAGING for now; we can find out later whether they build
   with python3 too.
---
 rules/python.in | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rules/python.in b/rules/python.in
index 75390188876e..7afc622b9786 100644
--- a/rules/python.in
+++ b/rules/python.in
@@ -1,4 +1,6 @@
-## SECTION=scripting_languages
+## SECTION=staging
+## old section:
+### SECTION=scripting_languages
 
 menuconfig PYTHON
tristate "python"
@@ -25,6 +27,9 @@ menuconfig PYTHON
  comes with extensive standard libraries, and
  can be learned in a few days.
 
+ STAGING: remove in PTXdist 2021.05.0 due to Python 2 End-of-Life:
+ 
.
+
 if PYTHON
 
 config PYTHON_NCURSES
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 2/2] php5: move away from staging

[Bruno Thomsen]

>  menuconfig PHP5
> @@ -19,10 +17,6 @@ menuconfig PHP5
> select SQLITE   if PHP5_EXT_SQLITE3
> select ZLIB if PHP5_EXT_ZLIB
> select OPENSSL  if PHP5_EXT_OPENSSL
> -   help
> - STAGING: remove in ptxdist-2021.05.0
> - Old version that need to be updated. Fails to build with gcc >= 9.x 
> on
> - on some architectures (AArch64).

Forgot to add that it compiles with gcc from the following toolchains:

arm-v5te-linux-gnueabi/gcc-7.3.1-glibc-2.27-binutils-2.30-kernel-4.15-sanitized
arm-v7a-linux-gnueabihf/gcc-9.2.1-clang-8.0.1-glibc-2.30-binutils-2.32-kernel-5.0-sanitized

I have not tested with an AArch64.

/Bruno

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/2] php5: version bump to 5.6.40

[Bruno Thomsen]

This is currently the last 5.x release of php, so this
version bump just closes known CVEs[1], and allow a little
extra time to migrate existing application to php 7.x.

Disabled fileinfo feature[2] as configure now contains a compile
check for existence of strcasestr. This fails as the cross
compiled binary cannot run on host arch.
This has an open upstream php bug[3].

New configuration parameters are default disabled.

[1] https://www.php.net/ChangeLog-5.php
[2] https://www.php.net/manual/en/book.fileinfo.php
[3] https://bugs.php.net/bug.php?id=69132

Signed-off-by: Bruno Thomsen 
---
 rules/php5.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/php5.make b/rules/php5.make
index 74b2658f3..d2e80c009 100644
--- a/rules/php5.make
+++ b/rules/php5.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PHP5) += php5
 #
 # Paths and names
 #
-PHP5_VERSION   := 5.5.30
-PHP5_MD5   := ef6d848756ea9d19b7a7e1a9d824d7c1
+PHP5_VERSION   := 5.6.40
+PHP5_MD5   := c7dde3afb16ce7b761abf2805125d372
 PHP5   := php-$(PHP5_VERSION)
 PHP5_SUFFIX:= tar.xz
 PHP5_SOURCE:= $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX)
@@ -49,6 +49,7 @@ PHP5_AUTOCONF := \
--disable-phar \
--with-config-file-path=/etc/php5 \
--enable-opcache=no \
+   --disable-fileinfo \
--without-xmlrpc \
--without-iconv
 
-- 
2.25.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] php5: move away from staging

[Bruno Thomsen]

This reverts commit 5f0f21033a19780828e8052724e893f129552116.

php5 has been updated to 5.6.40 so known CVEs has been resolved
and allows a little extra php7 migration time.

Signed-off-by: Bruno Thomsen 
---
 rules/cups.in | 1 -
 rules/lighttpd.in | 1 -
 rules/php5.in | 8 +---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/rules/cups.in b/rules/cups.in
index 2b78ea5be..d2f8e67bd 100644
--- a/rules/cups.in
+++ b/rules/cups.in
@@ -60,7 +60,6 @@ config CUPS_PERL
bool "enable Perl support for web interface"
 
 config CUPS_PHP
-   depends on STAGING
bool "enable PHP support for web interface"
 
 if CUPS_PHP
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 0e1dde14d..a8a06f06d 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -140,7 +140,6 @@ if LIGHTTPD_MOD_FASTCGI
 
 config LIGHTTPD_MOD_FASTCGI_PHP
bool
-   depends on STAGING
prompt "setup php handling with fastcgi"
help
  Enables the necessary packages and configuration files
diff --git a/rules/php5.in b/rules/php5.in
index f937f4e6b..c8bb79eda 100644
--- a/rules/php5.in
+++ b/rules/php5.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=scripting_languages
+## SECTION=scripting_languages
 # php5 configuration
 
 menuconfig PHP5
@@ -19,10 +17,6 @@ menuconfig PHP5
select SQLITE   if PHP5_EXT_SQLITE3
select ZLIB if PHP5_EXT_ZLIB
select OPENSSL  if PHP5_EXT_OPENSSL
-   help
- STAGING: remove in ptxdist-2021.05.0
- Old version that need to be updated. Fails to build with gcc >= 9.x on
- on some architectures (AArch64).
 
 if PHP5
 
-- 
2.25.4


___
ptxdist mailing list
ptxdist@pengutronix.de