[PATCH 1/4] automake: Update to 1.15

[PATCH 1/4] automake: Update to 1.15

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 662 bytes --]

Update to the latest available version of automake.

Required to build util-linux 2.27.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 automake/automake.nm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automake/automake.nm b/automake/automake.nm
index 128ba2c..ca553c1 100644
--- a/automake/automake.nm
+++ b/automake/automake.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = automake
-version    = 1.13.2
-release    = 2
+version    = 1.15
+release    = 1
 arch       = noarch
 
 groups     = Development/Tools
-- 
2.4.3

[PATCH 2/4] python-lxml: New package

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 2335 bytes --]

lxml provides a Python binding to the libxslt and libxml2 libraries.
It follows the ElementTree API as much as possible in order to provide
a more Pythonic interface to libxml2 and libxslt than the default
bindings. Build dependency for systemd python bindings.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 python-lxml/python-lxml.nm | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 python-lxml/python-lxml.nm

diff --git a/python-lxml/python-lxml.nm b/python-lxml/python-lxml.nm
new file mode 100644
index 0000000..82c07c5
--- /dev/null
+++ b/python-lxml/python-lxml.nm
@@ -0,0 +1,65 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = python-lxml
+version    = 3.4.4
+release    = 1
+thisapp    = lxml-%{version}
+
+groups     = Development/Languages
+url        = http://lxml.de
+license    = BSD
+summary    = ElementTree-like Python bindings for libxml2 and libxslt.
+
+description
+	lxml provides a Python binding to the libxslt and libxml2 libraries.
+	It follows the ElementTree API as much as possible in order to provide
+	a more Pythonic interface to libxml2 and libxslt than the default
+	bindings.
+end
+
+source_dl  = http://lxml.de/files/
+sources    = %{thisapp}.tgz
+
+build
+	requires
+		libxml2-devel
+		libxslt-devel
+		python3-devel
+		zlib-devel
+	end
+
+	build
+		CFLAGS="%{CFLAGS}" %{python3} setup.py build
+	end
+
+	test
+		# Setup test environment.
+		BUILD_LIB_DIR=$(find $(pwd) -name "*.so" | head -n 1 | xargs dirname)
+		cp $BUILD_LIB_DIR/*.so src/lxml
+		export LANG=en_US.utf8
+
+		# Run tests.
+		%{python3} test.py -p -v
+
+		# Launch more tests.
+		export PYTHONPATH=src
+		%{python3} selftest.py
+		%{python3} selftest2.py		
+	end
+
+	install
+		%{python3} setup.py install --skip-build -O1 \
+			--root=%{BUILDROOT}
+	end
+end
+
+packages
+	package python3-lxml
+
+	package python3-lxml-debuginfo
+		template DEBUGINFO
+	end
+end
-- 
2.4.3

[PATCH 3/4] systemd: Enable python bindings

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1051 bytes --]

Enable the build of systemd python bindings for python3.
Requires python-lxml and python development headers to be present.

Fixes #10969.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 systemd/systemd.nm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 0b8e604..35d2b0b 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 221
-release    = 3
+release    = 4
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -49,6 +49,8 @@ build
 		m4
 		pam-devel
 		pciutils-devel
+		python3-devel
+		python3-lxml
 		usbutils
 		vala
 		xz-devel
@@ -56,6 +58,7 @@ build
 	end
 
 	configure_options += \
+		PYTHON=%{python3} \
 		--with-sysvinit-path= \
 		--with-sysvrcnd-path= \
 		--enable-introspection \
@@ -429,6 +432,10 @@ packages
 		end
 	end
 
+	package python3-%{name}
+		template PYTHON3
+	end
+
 	package %{name}-debuginfo
 		template DEBUGINFO
 	end
-- 
2.4.3

[PATCH 4/4] util-linux: Update to 2.27

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

This is a major update to the latest stable version of util-linux.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 util-linux/util-linux.nm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 68c0ef9..4d14b85 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -4,10 +4,11 @@
 ###############################################################################
 
 name       = util-linux
-major_ver  = 2.25
-minor_ver  = 2
-version    = %{major_ver}.%{minor_ver}
-release    = 2
+major_ver  = 2.27
+minor_ver  = 
+version    = %{major_ver}
+#version    = %{major_ver}.%{minor_ver}
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -27,7 +28,7 @@ source_dl  = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{major_ver}/
 build
 	requires
 		audit-devel
-		automake >= 1.13
+		automake >= 1.15
 		coreutils >= 8.19
 		gettext
 		libcap-devel
-- 
2.4.3