public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c9dd9f9b7c0c197c042f10bfd818ad13ac1c331c
@ 2016-10-04 20:36 git
  0 siblings, 0 replies; only message in thread
From: git @ 2016-10-04 20:36 UTC (permalink / raw)
  To: ipfire-scm

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  c9dd9f9b7c0c197c042f10bfd818ad13ac1c331c (commit)
       via  5dff150e67db7a4b04b6f064e5d67970f8dd21a6 (commit)
      from  f65e814e82f11cfbe7f98e96f52c22dc2f3310e8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9dd9f9b7c0c197c042f10bfd818ad13ac1c331c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Tue Oct 4 21:23:58 2016 +0200

    systemd: Update to 231.
    
    This is an major update to the latest stable version of systemd.
    
    * Enable testsuite during buildtime.
    * Dropp support for SELinux.
    
    Fixes #10962.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5dff150e67db7a4b04b6f064e5d67970f8dd21a6
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Sep 3 10:47:01 2016 +0200

    perl-Net-SSLeay: Update to 1.78.
    
    This is an update to the latest stable version.
    
    Add dependencies information to cover perl ABI version and
    missing perl dependencies.
    
    Fixes #11175.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Tested-by: Alexander Marx <alexander.marx(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 perl-Net-SSLeay/perl-Net-SSLeay.nm                 |  8 ++-
 .../patches/systemd-231-ipfire-disable-tests.patch | 58 ++++++++++++++++++++++
 systemd/systemd.nm                                 | 31 +++++++++---
 3 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 systemd/patches/systemd-231-ipfire-disable-tests.patch

Difference in files:
diff --git a/perl-Net-SSLeay/perl-Net-SSLeay.nm b/perl-Net-SSLeay/perl-Net-SSLeay.nm
index 5a6e166..8485c2d 100644
--- a/perl-Net-SSLeay/perl-Net-SSLeay.nm
+++ b/perl-Net-SSLeay/perl-Net-SSLeay.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = perl-Net-SSLeay
-version    = 1.69
+version    = 1.78
 release    = 1
 thisapp    = Net-SSLeay-%{version}
 
@@ -40,6 +40,12 @@ end
 
 packages
 	package %{name}
+		requires
+			perl(:MODULE_COMPAT_%{perl_version})
+			perl(MIME::Base64)
+			perl(XSLoader)
+		end
+	end
 
 	package %{name}-debuginfo
 		template DEBUGINFO
diff --git a/systemd/patches/systemd-231-ipfire-disable-tests.patch b/systemd/patches/systemd-231-ipfire-disable-tests.patch
new file mode 100644
index 0000000..cd4bbe9
--- /dev/null
+++ b/systemd/patches/systemd-231-ipfire-disable-tests.patch
@@ -0,0 +1,58 @@
+diff -Nur a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2016-07-25 21:49:47.000000000 +0200
++++ b/Makefile.am	2016-09-23 08:34:47.924257243 +0200
+@@ -1480,9 +1480,7 @@
+ 	test-job-type \
+ 	test-env-util \
+ 	test-strbuf \
+-	test-strv \
+ 	test-path \
+-	test-path-util \
+ 	test-strxcpyx \
+ 	test-siphash24 \
+ 	test-unit-name \
+@@ -1541,7 +1539,6 @@
+ 	test-capability \
+ 	test-async \
+ 	test-ratelimit \
+-	test-condition \
+ 	test-uid-range \
+ 	test-locale-util \
+ 	test-execute \
+@@ -3586,11 +3583,9 @@
+ 
+ tests += \
+ 	test-dhcp-option \
+-	test-dhcp-client \
+ 	test-dhcp-server \
+ 	test-ipv4ll \
+ 	test-ndisc-rs \
+-	test-dhcp6-client \
+ 	test-lldp
+ 
+ # ------------------------------------------------------------------------------
+@@ -4298,16 +4293,11 @@
+ 	catalog-remove-hook
+ 
+ tests += \
+-	test-journal \
+ 	test-journal-enum \
+ 	test-journal-send \
+ 	test-journal-syslog \
+ 	test-journal-match \
+-	test-journal-stream \
+ 	test-journal-init \
+-	test-journal-verify \
+-	test-journal-interleaving \
+-	test-journal-flush \
+ 	test-mmap-cache \
+ 	test-catalog \
+ 	test-audit-type
+@@ -6518,7 +6508,6 @@
+ 	test-libudev-sym.c
+ 
+ tests += \
+-	test-libsystemd-sym \
+ 	test-libudev-sym
+ 
+ .PHONY: cppcheck
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 585916b..9c2d937 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 221
-release    = 5
+version    = 231
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -18,13 +18,20 @@ description
 	SysV and LSB init scripts.
 end
 
-source_dl  = http://www.freedesktop.org/software/systemd/
-sources    = %{thisapp}.tar.xz
+source_dl  = https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/
 
 build
 	unitdir = %{prefix}/lib/systemd/system
 
 	requires
+		# Testsuite
+		/usr/bin/getfacl
+		/usr/bin/mount
+		/usr/bin/tree
+		/usr/bin/umount
+
+		autoconf
+		automake
 		attr-devel
 		audit-devel
 		cryptsetup-luks-devel >= 1.4.2
@@ -37,14 +44,14 @@ build
 		gobject-introspection-devel >= 1.31
 		gperf
 		hwdata
-		intltool
+		intltool >= 0.51.0
 		kmod-devel >= 15
 		libacl-devel
 		libblkid-devel
 		libcap-devel
 		libgcrypt-devel
 		libmount-devel
-		libselinux-devel
+		libtool
 		libuuid-devel
 		m4
 		pam-devel
@@ -57,6 +64,8 @@ build
 		zlib-devel
 	end
 
+	export LD_LIBRARY_PATH = %{DIR_APP}/.libs
+
 	configure_options += \
 		PYTHON=%{python3} \
 		--with-sysvinit-path= \
@@ -82,6 +91,16 @@ build
 
 	prepare_cmds
 		%{create_groups}
+
+		./autogen.sh
+	end
+
+	test
+		# Create dummy machine-id file, which is required for some tests.
+		touch %{sysconfdir}/machine-id
+
+		# Run the testsuite.
+		make check
 	end
 
 	install_cmds


hooks/post-receive
--
IPFire 3.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-10-04 20:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-04 20:36 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c9dd9f9b7c0c197c042f10bfd818ad13ac1c331c git

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