[ptxdist] Antwort: Re: Antwort: Re: [PATCH] openvpn: version bump 2.3.11 -> 2.3.13

[Tobias Schmidl]

Hello all,

-"ptxdist" <ptxdist-boun...@pengutronix.de> schrieb: -
> FWIW: There are some helpful hints on e-mail clients in the Linux
> kernel documentation:

> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/email-clients.txt

> The patch we are talking about was sent with Lotus according to mail
> headers. Lotus was the default in my company as well for years and it
> really sucks at e-mail. So what I did was pushing my stuff to my
> personal public git clone [1], pull it at home and send it with my
> personal mail account. ¯\_()_/¯

Tell me about it... But then I tried three different MTAs (Evolution,
LN and Thunderbird), and all of them mangle the inline patches, so
I've included the (very simple) patch as an attachment. 

One note: The OpenVPN Download page[1] gives me sometimes a 404 for
the source.tar.xz, even though the source itself[2] *can* be reached by
curl. Maybe some weird caching issue.

Regards,

Tobias Schmidl

[1] https://openvpn.net/index.php/download/community-downloads.html
[2] https://swupdate.openvpn.org/community/releases/openvpn-2.3.13.tar.xz


0001-openvpn:-versionbump2.3.11->2.3.13.patch
Description: Binary data
___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Antwort: Re: [PATCH] openvpn: version bump 2.3.11 -> 2.3.13

[Tobias Schmidl]

Hello all, 

-"ptxdist"  schrieb: -
>
> This patch does not apply. Something (Your mail client?) replaced all tabs
> with spaces.
> 

are patches in attachments accepted on this mailing list?

Best regards,

Tobias

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] openvpn: version bump 2.3.11 -> 2.3.13

[Tobias Schmidl]

Signed-off-by: Tobias Schmidl <t.schm...@erhardt-leimer.com>

diff --git a/rules/openvpn.make b/rules/openvpn.make
index 532809d..be84ee8 100644
--- a/rules/openvpn.make
+++ b/rules/openvpn.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
 #
 # Paths and names
 #
-OPENVPN_VERSION:= 2.3.11
-OPENVPN_MD5:= fe17a25235d65e60af8986c6c78c4650
+OPENVPN_VERSION:= 2.3.13
+OPENVPN_MD5:= 4955e1d35bf5dc2c3ed9b98c280ee661
 OPENVPN:= openvpn-$(OPENVPN_VERSION)
 OPENVPN_SUFFIX := tar.xz
 OPENVPN_URL:= 
http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX)

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Added support for boost.python

[Tobias Schmidl]

This works both against python2 and python3.

Signed-off-by: Tobias Schmidl <t.schm...@erhardt-leimer.com>
---
 rules/boost.in   | 30 +++---
 rules/boost.make | 10 ++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/rules/boost.in b/rules/boost.in
index f1ceeb0..3ed0253 100644
--- a/rules/boost.in
+++ b/rules/boost.in
@@ -245,8 +245,32 @@ config BOOST_WAVE
 
 config BOOST_PYTHON
bool
+
+choice
prompt "python"
-   depends on BROKEN
-   help
- boost python support (still broken)
+   default BOOST_NOPYTHON
+
+   config BOOST_NOPYTHON
+   bool
+   prompt "no python support"
+   help
+ Select this option if you don't want to build boost.python.
+
+   config BOOST_PYTHON2
+   bool
+   prompt "python2"
+   select PYTHON
+   select BOOST_PYTHON
+   help
+ Select this option if you want to use boost.python in 
combination with python2.
+
+   config BOOST_PYTHON3
+   bool
+   prompt "python3"
+   select PYTHON3
+   select BOOST_PYTHON
+   help
+ Select this option if you want to use boost.python in 
combination with python3.
+endchoice
+
 endif
diff --git a/rules/boost.make b/rules/boost.make
index e9a1e33..46858d0 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -132,6 +132,16 @@ $(STATEDIR)/boost.prepare:
cd $(BOOST_DIR) && ./bootstrap.sh $(BOOST_CONF_OPT)
@cd $(BOOST_DIR) && \
echo "using gcc : $(PTXCONF_ARCH_STRING) : $(CROSS_CXX) ;" > 
$(BOOST_DIR)/user-config.jam
+
+ifdef PTXCONF_BOOST_PYTHON3
+   @cd $(BOOST_DIR) && \
+   echo "using python : $(PYTHON3_MAJORMINOR) : 
$(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR)m 
: $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> 
$(BOOST_DIR)/user-config.jam
+endif
+ifdef PTXCONF_BOOST_PYTHON2
+   @cd $(BOOST_DIR) && \
+   echo "using python : $(PYTHON_MAJORMINOR) : 
$(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON_MAJORMINOR)m 
: $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) ;" >> 
$(BOOST_DIR)/user-config.jam
+endif
+
@echo "all:">  $(BOOST_DIR)/Makefile
@echo ' @$(BOOST_JAM) $(JAM_MAKE_OPT)'  >> $(BOOST_DIR)/Makefile
@echo "install:">> $(BOOST_DIR)/Makefile
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] Antwort: Re: [PATCH 2/2] Improved support for boost.python

[Tobias Schmidl]

Hello all,


-"ptxdist" <ptxdist-boun...@pengutronix.de> schrieb: -
>> On Tue, Jan 26, 2016 at 02:22:19PM +0100, Tobias Schmidl wrote:
>> This works both against python2 and python3.
>> 
> This wont work. You need a choice here with BOOST_NOPYTHON / BOOST_PYTHON /
> BOOST_PYTHON3 and then 'select' the correct python version in the toplevel
> option. If there is no build-time dependency then use
> 
>   select PTYHON3  if RUNTIME
> 

thanks, will resubmit.

Best regards,

Tobias


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] libboost: version bump 1.59.0 -> 1.60.0

[Tobias Schmidl]

Hello all,

>
> We have one patch for 1_59_0. Please check if it was applied or is still
> needed.
> 
> Michael
> 

yup, still applies. I've attached the corrected patch

Best regards,

Tobias Schmidl


boost-version-bump-1.59.0-1.60.0.patch
Description: Binary data
___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libpoco: version bump 1.4.6p2 -> 1.6.1

[Tobias Schmidl]

See 
https://raw.githubusercontent.com/pocoproject/poco/poco-1.6.1-release/CHANGELOG 
for more information.

Signed-off-by: Tobias Schmidl <t.schm...@erhardt-leimer.com>
---
 ...ke-Linux-configuration-crosscompile-aware.patch | 38 --
 patches/poco-1.4.6p2/series|  5 ---
 patches/poco-1.6.1/0001-libpcre-bug.patch  | 12 +++
 .../0002-fix-parallel-building.patch   |  0
 ...003-Include-pcre.h-for-an-unbundled-build.patch | 38 ++
 patches/poco-1.6.1/series  |  3 ++
 rules/poco.make|  9 ++---
 7 files changed, 58 insertions(+), 47 deletions(-)
 delete mode 100644 
patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
 delete mode 100644 patches/poco-1.4.6p2/series
 create mode 100644 patches/poco-1.6.1/0001-libpcre-bug.patch
 rename patches/{poco-1.4.6p2 => poco-1.6.1}/0002-fix-parallel-building.patch 
(100%)
 create mode 100644 
patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
 create mode 100644 patches/poco-1.6.1/series

diff --git 
a/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch 
b/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
deleted file mode 100644
index fb15644..000
--- 
a/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Robert Schwebel <r.schwe...@pengutronix.de>
-Date: Fri, 24 Jun 2011 21:21:27 +0200
-Subject: [PATCH] make Linux configuration crosscompile aware
-
-Currently, the "Linux" configuration cannot be cross compiled because
-the compiler is configured unconditionally. We add the CROSS_COMPILE
-prefix: this way it is easily possible to overwrite that variable from
-the commandline and use any cross compiler.
-
-Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de>

- build/config/Linux | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build/config/Linux b/build/config/Linux
-index 4781a12..7612e59 100644
 a/build/config/Linux
-+++ b/build/config/Linux
-@@ -15,14 +15,14 @@ LINKMODE ?= SHARED
- #
- # Define Tools
- #
--CC  = gcc
--CXX = g++
-+CC  = $(CROSS_COMPILE)gcc
-+CXX = $(CROSS_COMPILE)g++
- LINK= $(CXX)
--LIB = ar -cr
--RANLIB  = ranlib
-+LIB = $(CROSS_COMPILE)ar -cr
-+RANLIB  = $(CROSS_COMPILE)ranlib
- SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
- SHLIBLN = $(POCO_BASE)/build/script/shlibln
--STRIP   = strip
-+STRIP   = $(CROSS_COMPILE)strip
- DEP = $(POCO_BASE)/build/script/makedepend.gcc 
- SHELL   = sh
- RM  = rm -rf
diff --git a/patches/poco-1.4.6p2/series b/patches/poco-1.4.6p2/series
deleted file mode 100644
index d5d1e3b..000
--- a/patches/poco-1.4.6p2/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-Linux-configuration-crosscompile-aware.patch
-0002-fix-parallel-building.patch
-# caa577b66d6611048eb3d4345dc8d6a4  - git-ptx-patches magic
diff --git a/patches/poco-1.6.1/0001-libpcre-bug.patch 
b/patches/poco-1.6.1/0001-libpcre-bug.patch
new file mode 100644
index 000..97d5d05
--- /dev/null
+++ b/patches/poco-1.6.1/0001-libpcre-bug.patch
@@ -0,0 +1,12 @@
+diff --git a/Foundation/Makefile b/Foundation/Makefile
+index 45ade1c..895b575 100644
+--- a/Foundation/Makefile
 b/Foundation/Makefile
+@@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
+ 
+ ifdef POCO_UNBUNDLED
+   SYSLIBS += -lpcre -lz
++  objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
+ else
+   objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
+ endif
diff --git a/patches/poco-1.4.6p2/0002-fix-parallel-building.patch 
b/patches/poco-1.6.1/0002-fix-parallel-building.patch
similarity index 100%
rename from patches/poco-1.4.6p2/0002-fix-parallel-building.patch
rename to patches/poco-1.6.1/0002-fix-parallel-building.patch
diff --git 
a/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch 
b/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
new file mode 100644
index 000..b5d6b35
--- /dev/null
+++ b/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
@@ -0,0 +1,38 @@
+From 94bb16fdeea5cd804c586b282cdbdd1c45360718 Mon Sep 17 00:00:00 2001
+From: zosrothko <zosrot...@orange.fr>
+Date: Tue, 17 Nov 2015 18:45:44 +0100
+Subject: [PATCH] Include  for an unbundled build.
+
+---
+ Foundation/include/Poco/RegularExpression.h | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Foundation/include/Poco/RegularExpression.h 
b/Foundation/include/Poco/RegularExpression.h
+index 9181d29..e2b3446 100644
+--- a/Foundation/include/Poco/RegularExpression.h
 b/Foundation/include/Poco/RegularExpression.h
+@@ -28,17 +28,19 @@
+ #include 
+ 
+ 
++#ifdef POCO_UNBUNDLED
++#include 
++#else
+ //
+ 

[ptxdist] [PATCH 1/2] Added cross library dependencies

[Tobias Schmidl]

Lots of boost repositories cannot be built if another boost lib isn't
present. This patch adds some checks against this.

Signed-off-by: Tobias Schmidl <t.schm...@erhardt-leimer.com>
---
 rules/boost.in | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/rules/boost.in b/rules/boost.in
index 7c196f4..f1ceeb0 100644
--- a/rules/boost.in
+++ b/rules/boost.in
@@ -30,6 +30,7 @@ menuconfig BOOST
  For details see the project homepage:
 
http://www.boost.org/
+
 if BOOST
 comment "Targetinstall Options "
 
@@ -65,7 +66,10 @@ comment "Boost Libraries"
 
 config BOOST_ATOMIC
bool
+   select BOOST_CHRONO
+   select BOOST_DATE_TIME
select BOOST_SYSTEM
+   select BOOST_THREAD
prompt "atomic"
help
  Boost atomic library
@@ -150,6 +154,11 @@ config BOOST_LOCALE
 
 config BOOST_LOG
bool
+   select BOOST_DATE_TIME
+   select BOOST_FILESYSTEM
+   select BOOST_REGEX
+   select BOOST_SYSTEM
+   select BOOST_THREAD
prompt "log"
help
  Boost log library
@@ -158,13 +167,13 @@ config BOOST_MATH
bool
prompt "math"
help
- Boost iostream library
+ Boost Math library
 
 config BOOST_MPI
bool
prompt "mpi"
help
- Boost iostream library
+ Boost MPI library
 
 config BOOST_PROGRAM_OPTIONS
bool
@@ -222,7 +231,7 @@ config BOOST_TIMER
select BOOST_SYSTEM
prompt "timer"
help
- Boost iostream library
+ Boost timer library
 
 config BOOST_WAVE
bool
-- 
2.1.4

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] Improved support for boost.python

[Tobias Schmidl]

This works both against python2 and python3.

Signed-off-by: Tobias Schmidl <t.schm...@erhardt-leimer.com>
---
 rules/boost.in   |  4 ++--
 rules/boost.make | 15 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/rules/boost.in b/rules/boost.in
index f1ceeb0..ded0317 100644
--- a/rules/boost.in
+++ b/rules/boost.in
@@ -246,7 +246,7 @@ config BOOST_WAVE
 config BOOST_PYTHON
bool
prompt "python"
-   depends on BROKEN
+   depends on PYTHON || PYTHON3
help
- boost python support (still broken)
+ boost python support
 endif
diff --git a/rules/boost.make b/rules/boost.make
index a1c4d17..3bc3efb 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -131,8 +131,20 @@ BOOST_CONF_OPT := \
 $(STATEDIR)/boost.prepare:
@$(call targetinfo)
cd $(BOOST_DIR) && ./bootstrap.sh $(BOOST_CONF_OPT)
+
@cd $(BOOST_DIR) && \
echo "using gcc : $(PTXCONF_ARCH_STRING) : $(CROSS_CXX) ;" > 
$(BOOST_DIR)/user-config.jam
+
+ifdef PTXCONF_BOOST_PYTHON
+ifdef PTXCONF_PYTHON3
+   @cd $(BOOST_DIR) && \
+   echo "using python : $(PYTHON3_MAJORMINOR) : 
$(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON3_MAJORMINOR)m 
: $(SYSROOT)/usr/lib/python$(PYTHON3_MAJORMINOR) ;" >> 
$(BOOST_DIR)/user-config.jam
+else
+   @cd $(BOOST_DIR) && \
+   echo "using python : $(PYTHON_MAJORMINOR) : 
$(SYSROOT)/usr/bin/python : $(SYSROOT)/usr/include/python$(PYTHON_MAJORMINOR)m 
: $(SYSROOT)/usr/lib/python$(PYTHON_MAJORMINOR) ;" >> 
$(BOOST_DIR)/user-config.jam
+endif
+endif
+
@echo "all:">  $(BOOST_DIR)/Makefile
@echo ' @$(BOOST_JAM) $(JAM_MAKE_OPT)'  >> $(BOOST_DIR)/Makefile
@echo "install:">> $(BOOST_DIR)/Makefile
@@ -156,7 +168,7 @@ $(STATEDIR)/boost.targetinstall:
 
@$(call install_init, boost)
@$(call install_fixup, boost,PRIORITY,optional)
-   @$(call install_fixup, boost,SECTION,base)
+   @$(call install_fixup, boost,SECTION,system_libraries)
@$(call install_fixup, boost,AUTHOR,"Robert Schwebel 
<r.schwe...@pengutronix.de>")
@$(call install_fixup, boost,DESCRIPTION,missing)
 
@@ -211,4 +223,5 @@ $(STATEDIR)/boost.targetinstall:
 
@$(call touch)
 
+# kate: syntax Makefile
 # vim: syntax=make
-- 
2.1.4


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libboost: version bump 1.59.0 -> 1.60.0

[Tobias Schmidl]

Signed-off-by: Tobias Schmidl <t.schm...@erhardt-leimer.com>
---
 rules/boost.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/boost.make b/rules/boost.make
index 3bc3efb..95887f6 100644
--- a/rules/boost.make
+++ b/rules/boost.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_BOOST) += boost
 #
 # Paths and names
 #
-BOOST_VERSION  := 1_59_0
-BOOST_MD5  := 6aa9a5c6a4ca1016edd0ed1178e3cb87
+BOOST_VERSION  := 1_60_0
+BOOST_MD5  := 65a840e1a0b13a558ff19eeb2c4f0cbe
 BOOST  := boost_$(BOOST_VERSION)
 BOOST_SUFFIX   := tar.bz2
 BOOST_URL  := $(call ptx/mirror, SF, boost/$(BOOST).$(BOOST_SUFFIX))
-- 
2.1.4

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] ipkg.control: allow IPKG's Source field to be populated by users

[Tobias Schmidl]

Hello,

do you have any comments on this?

Best regards,

Tobias

 An: ptxdist@pengutronix.de
 Von: Tobias Schmidl 
 Gesendet von: ptxdist 
 Datum: 22.07.2015 14:36
 Betreff: [ptxdist] [PATCH] ipkg.control: allow IPKG's Source field to
be populated by users

 We want to be able to set the Source field in ipkg's control block
 by ourself, so that we're able to distinguish different package sources.

 Additionally, this is the only left hard coded option, so now the control
 block is fully customizable.
 ---
  config/xpkg/ipkg.control | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/config/xpkg/ipkg.control b/config/xpkg/ipkg.control
 index 691dd74..350e603 100644
 --- a/config/xpkg/ipkg.control
 +++ b/config/xpkg/ipkg.control
 @@ -5,5 +5,5 @@ Section:  @SECTION@
  Architecture:@ARCH@
  Maintainer:  @AUTHOR@
  Depends: @DEPENDS@
 -Source:  http://www.ptxdist.org/
 +Source:  @SOURCE@
  Description: @DESCRIPTION@
 -- 
 2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] ipkg.control: allow IPKG's Source field to be populated by users

[Tobias Schmidl]

We want to be able to set the Source field in ipkg's control block
by ourself, so that we're able to distinguish different package sources.

Additionally, this is the only left hard coded option, so now the control
block is fully customizable.
---
 config/xpkg/ipkg.control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/xpkg/ipkg.control b/config/xpkg/ipkg.control
index 691dd74..350e603 100644
--- a/config/xpkg/ipkg.control
+++ b/config/xpkg/ipkg.control
@@ -5,5 +5,5 @@ Section:@SECTION@
 Architecture:  @ARCH@
 Maintainer:@AUTHOR@
 Depends:   @DEPENDS@
-Source:http://www.ptxdist.org/
+Source:@SOURCE@
 Description:   @DESCRIPTION@
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de