From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. eac3ee6bc4c11ee2441fc8195862b726bef5c7f7
Date: Fri, 21 Oct 2016 14:20:19 +0100 [thread overview]
Message-ID: <20161021132020.CA6211081BA5@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 36797 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 eac3ee6bc4c11ee2441fc8195862b726bef5c7f7 (commit)
via 8ccd42831c0ca8cd4531a4f93df981d79bfe5bb2 (commit)
via 963c362fb52a5d7891e22734768e0079f2d0bc9d (commit)
via d39996fe4cf6c228c9f4bef70eb069604f1ea258 (commit)
via a725c75b7348e55b7f7083829594c5b9c1f75f61 (commit)
via 14ccf678950d1e7dd42ecfacf2aed087e359fd38 (commit)
via c815d0c1e584f895123dc3470946e510b49becbb (commit)
via bcebefae07cf7165251703d531825086382798be (commit)
via 42861d427b4044173eeda51c02ae1a19fbb7a269 (commit)
via ae2ad301257ede0dbac19f3fe2e6aed9c57f566f (commit)
via e133a268d4d021fe3ed2e178030e034423886c85 (commit)
via b65011e5eda3020b7f5dc6c605a8c4808b599d30 (commit)
via 45becd6d66316e65986960be390749264bbcc058 (commit)
via be75e8560712cb745d4181b0e95151910d2d3dd5 (commit)
via f290a2f09e6980c9aaa62a4750accd6db54f4b2d (commit)
via f364b64c1fb2aec5f08af418313be1d2f665c663 (commit)
via b06fd71cbeea8770c26611948a3b97eeb2a1771a (commit)
via 659c499155c845a660c6571bd39a7e83849f5995 (commit)
from ef47b32850b900bd7522cb27200eb2072917b1a2 (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 eac3ee6bc4c11ee2441fc8195862b726bef5c7f7
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 13:47:22 2016 +0200
glib2: Update to 2.50.1
This is a major update to the latest stable version of glib2.
* Drop SELinux support.
Fixes #11208.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8ccd42831c0ca8cd4531a4f93df981d79bfe5bb2
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 13:37:57 2016 +0200
fuse: Drop SELinux support
Fixes #11207.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 963c362fb52a5d7891e22734768e0079f2d0bc9d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 21 14:03:37 2016 +0100
glibc: Remove support for selinux
Fixes #11209
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d39996fe4cf6c228c9f4bef70eb069604f1ea258
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 21 14:02:44 2016 +0100
python: Link crypt module against libcrypt
The crypt module wasn't correctly linked against libcrypt
which is now fixed in this patch.
Reported-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a725c75b7348e55b7f7083829594c5b9c1f75f61
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 21 12:59:09 2016 +0100
qemu: Split package into multiple sub-packages
Create one package for each architecture, one for image
manipulation tools and have the main package pull in
the default emulator for each architecture.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 14ccf678950d1e7dd42ecfacf2aed087e359fd38
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 11:32:15 2016 +0200
findutils: Drop SELinux support
Fixes #11206.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c815d0c1e584f895123dc3470946e510b49becbb
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 11:27:08 2016 +0200
cups: Add tmpfiles.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bcebefae07cf7165251703d531825086382798be
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 11:24:55 2016 +0200
dmraid: Update to 1.0.0.rc16
This is a minor update to the latest available version of dmraid.
* Drop SELinux support.
Fixes #11204.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 42861d427b4044173eeda51c02ae1a19fbb7a269
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 11:12:58 2016 +0200
lvm2: Update to 2.02.166
This is a minor update to the latest available version of lvm2.
* Splitt package into more sub-packages.
* Enable systemd support and add scriptlets.
* Drop SELinux support.
Fixes #11215.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ae2ad301257ede0dbac19f3fe2e6aed9c57f566f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 08:47:09 2016 +0200
patch: Update to 2.7.5
This is a minor update to the latest available version of patch.
* Drop SELinux support.
Fixes #11222.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e133a268d4d021fe3ed2e178030e034423886c85
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 08:41:29 2016 +0200
cups: Update to 2.2.1
This is a minor update to the latest stable version of cups.
* Enable the web administration interface.
* Add support for systemd.
* Splitt into more sub-pakages.
* Drop SELinux support.
Fixes #11202.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b65011e5eda3020b7f5dc6c605a8c4808b599d30
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 08:05:15 2016 +0200
psmisc: Drop SELinux support
Fixes #11224.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 45becd6d66316e65986960be390749264bbcc058
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 08:01:48 2016 +0200
tar: Disable SELinux support
Fixes #11231.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit be75e8560712cb745d4181b0e95151910d2d3dd5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 21 07:53:25 2016 +0200
libvirt: Update to 2.3.0
This is a major update to the latest available version of libvirt.
* Drop SELinux support.
Fixes #11212.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f290a2f09e6980c9aaa62a4750accd6db54f4b2d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 20 20:13:54 2016 +0000
qemu: Update to 2.7.0
Enables various modules and adds softmmu support for
ARM, aarch64 and x86_64.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f364b64c1fb2aec5f08af418313be1d2f665c663
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Oct 20 09:31:06 2016 +0200
cronie: Update to 1.5.1
This is a major update to the latest stable version of cronie.
* Drop support for SELinux.
Fixes #11201.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b06fd71cbeea8770c26611948a3b97eeb2a1771a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Oct 20 08:57:07 2016 +0200
procps-ng: Update to 3.3.12
This is a minor update to the latest version of procps-ng.
* Drop SELinux support.
Fixes #11223.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 659c499155c845a660c6571bd39a7e83849f5995
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 20 20:12:38 2016 +0000
tzdata: Update to 2016h
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
cronie/cronie.nm | 8 +-
cronie/patches/cronie-1.4.10-use-setenv.patch | 27 ----
cups/cups-lp.tmpfiles | 4 +
cups/cups.logrotate | 5 -
cups/cups.nm | 165 ++++++++++++++++++++++--
cups/cups.tmpfiles | 4 +
dmraid/dmraid.nm | 14 +-
findutils/findutils.nm | 3 +-
fuse/fuse.nm | 6 +-
glib2/glib2.nm | 7 +-
glibc/glibc.nm | 4 +-
libvirt/libvirt.nm | 12 +-
lvm2/lvm2.nm | 177 +++++++++++++++++++++++++-
patch/patch.nm | 3 +-
procps-ng/procps-ng.nm | 6 +-
psmisc/psmisc.nm | 6 +-
python/patches/python-2.7.1-config.patch | 2 +-
python/python.nm | 2 +-
qemu/qemu.nm | 124 ++++++++++++++++--
tar/tar.nm | 4 +-
tzdata/tzdata.nm | 4 +-
21 files changed, 476 insertions(+), 111 deletions(-)
delete mode 100644 cronie/patches/cronie-1.4.10-use-setenv.patch
create mode 100644 cups/cups-lp.tmpfiles
delete mode 100644 cups/cups.logrotate
create mode 100644 cups/cups.tmpfiles
Difference in files:
diff --git a/cronie/cronie.nm b/cronie/cronie.nm
index c541043..80a82fe 100644
--- a/cronie/cronie.nm
+++ b/cronie/cronie.nm
@@ -4,7 +4,7 @@
###############################################################################
name = cronie
-version = 1.4.9
+version = 1.5.1
release = 1
groups = System/Environment/Base
@@ -27,7 +27,6 @@ build
bison
libcap-devel
libedit-devel
- libselinux-devel
pam-devel
readline-devel
systemd-units
@@ -37,12 +36,15 @@ build
configure_options += \
--with-pam \
--with-audit \
- --with-selinux \
--with-inotify \
--enable-anacron \
--enable-pie \
--enable-relro
+ test
+ # Cronie does not provide any kind of testsuite.
+ end
+
install_cmds
mkdir -pv %{BUILDROOT}%{localstatedir}/spool/{ana,}cron
diff --git a/cronie/patches/cronie-1.4.10-use-setenv.patch b/cronie/patches/cronie-1.4.10-use-setenv.patch
deleted file mode 100644
index ddbfbbb..0000000
--- a/cronie/patches/cronie-1.4.10-use-setenv.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5ac31751adfa31c5e5e316afc2f800037bd1cdca Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz(a)fedoraproject.org>
-Date: Thu, 6 Jun 2013 20:13:26 +0200
-Subject: [PATCH] Do not use putenv with string literal.
-
----
- src/cron.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cron.c b/src/cron.c
-index 9974887..08d0812 100644
---- a/src/cron.c
-+++ b/src/cron.c
-@@ -244,8 +244,8 @@ int main(int argc, char *argv[]) {
- check_spool_dir();
-
- if (ChangePath) {
-- if (putenv("PATH=" _PATH_DEFPATH) < 0) {
-- log_it("CRON", pid, "DEATH", "can't putenv PATH",
-+ if (setenv("PATH", _PATH_DEFPATH, 1) < 0) {
-+ log_it("CRON", pid, "DEATH", "can't setenv PATH",
- errno);
- exit(1);
- }
---
-1.7.7.6
-
diff --git a/cups/cups-lp.tmpfiles b/cups/cups-lp.tmpfiles
new file mode 100644
index 0000000..21989a7
--- /dev/null
+++ b/cups/cups-lp.tmpfiles
@@ -0,0 +1,4 @@
+c /dev/lp0 0660 root lp - 6:0
+c /dev/lp1 0660 root lp - 6:1
+c /dev/lp2 0660 root lp - 6:2
+c /dev/lp3 0660 root lp - 6:3
diff --git a/cups/cups.logrotate b/cups/cups.logrotate
deleted file mode 100644
index 773c70f..0000000
--- a/cups/cups.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/cups/*_log {
- missingok
- notifempty
- sharedscripts
-}
diff --git a/cups/cups.nm b/cups/cups.nm
index a58ec49..682f300 100644
--- a/cups/cups.nm
+++ b/cups/cups.nm
@@ -4,7 +4,7 @@
###############################################################################
name = cups
-version = 2.1.4
+version = 2.2.1
release = 2
groups = Applications/Printing
@@ -13,11 +13,11 @@ license = GPLv2+
summary = The common UNIX printing system.
description
- CUPS is the standards-based, open source printing system developed \
+ CUPS is the standards-based, open source printing system developed
by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems.
end
-source_dl = https://github.com/apple/cups/releases/download/release-%{version}/
+source_dl = https://github.com/apple/cups/releases/download/v%{version}/
sources = %{thisapp}-source.tar.gz
build
@@ -28,32 +28,37 @@ build
avahi-devel
cyrus-sasl-devel
gcc-c++
- ghostscript
gnutls-devel
+ libacl-devel
libgcrypt-devel
libjpeg-devel
libpng-devel
- libselinux-devel
libtasn1-devel
libtiff-devel
+ libusb-devel
openldap-devel
openssl-devel
pam-devel
- perl
- python
+ systemd-devel
zlib-devel
end
+ CFLAGS += -DLDAP_DEPRECATED=1
+
configure_options += \
- --sysconfdir=/etc \
- --localstatedir=/var \
+ --localedir=%{datadir}/locale \
+ --with-cupsd-file-perm=0755 \
--with-log-file-perm=0600 \
+ --with-docdir=%{datadir}/%{name}/www \
+ --with-dbusdir=%{sysconfdir}/dbus-1 \
--enable-pie \
--enable-relro \
--enable-avahi \
--enable-lspp \
--enable-threads \
- --enable-gnutls
+ --enable-gnutls \
+ --enable-webif \
+ --with-xinetd=no
prepare_cmds
aclocal -I config-scripts
@@ -66,18 +71,129 @@ build
# Remove sysvinit scripts
rm -vfr %{BUILDROOT}/etc/init.d/cups %{BUILDROOT}/etc/rc*.d
+ # Install default config file.
mkdir -pv %{BUILDROOT}/etc/cups
cp -vf %{DIR_APP}/conf/cupsd.conf %{BUILDROOT}/etc/cups/
- # Logrotate
- mkdir -pv %{BUILDROOT}/etc/logrotate.d/
- cp -vf %{DIR_SOURCE}/cups.logrotate %{BUILDROOT}/etc/logrotate.d/cups
+ # Rename systemd service files.
+ mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.path \
+ %{BUILDROOT}%{unitdir}/cups.path
+ mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.service \
+ %{BUILDROOT}%{unitdir}/cups.service
+ mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.socket \
+ %{BUILDROOT}%{unitdir}/cups.socket
+ mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd.socket \
+ %{BUILDROOT}%{unitdir}/cups-lpd.socket
+ mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd(a).service \
+ %{BUILDROOT}%{unitdir}/cups-lpd(a).service
+
+ sed -i -e "s,org.cups.cupsd,cups,g" \
+ %{BUILDROOT}%{unitdir}/cups.service
+
+ # Fix permissions
+ chown root:lp %{BUILDROOT}%{localstatedir}/run/cups
+ chmod 0755 %{BUILDROOT}%{localstatedir}/run/cups
end
end
packages
package %{name}
- requires = ghostscript
+ recomends
+ ghostscript
+ end
+
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl --no-reload enable cups.path >/dev/null 2>&1 || :
+ end
+
+ script preun
+ systemctl --no-reload disable cups.path >/dev/null 2>&1 || :
+ systemctl --no-reload disable cupsd.socket >/dev/null 2>&1 || :
+ systemctl --no-reload disable cupsd.service >/dev/null 2>&1 || :
+ systemctl stop cupsd.socket >/dev/null 2>&1 || :
+ systemctl stop cupsd.service >/dev/null 2>&1 || :
+ systemctl stop cups.path >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl try-restart cups.path >/dev/null 2>&1 || :
+ systemctl try-restart cupsd.service >/dev/null 2>&1 || :
+ end
+ end
+
+ package %{name}-client
+ summary = CUPS printing system - client programs.
+ description
+ CUPS printing system provides a portable printing layer for
+ UNIX operating systems. This package contains command-line client
+ programs.
+ end
+
+ requires
+ %{name}-libs = %{thisver}
+ end
+
+ provides += \
+ lpr
+
+ files
+ %{sbindir}/lpc.cups
+ %{bindir}/cancel*
+ %{bindir}/lp*
+ %{mandir}/man1/lp*.1.gz
+ %{mandir}/man1/cancel-cups.1.gz
+ %{mandir}/man8/lpc-cups.8.gz
+ end
+ end
+
+ package %{name}-lpd
+ summary = CUPS printing system - lpd emulation.
+ description
+ CUPS printing system provides a portable printing layer for
+ UNIX operating systems. This is the package that provides standard
+ lpd emulation.
+ end
+
+ requires
+ %{name} = %{thisver}
+ %{name}-libs = %{thisver}
+ end
+
+ provides += \
+ lpd
+
+ files
+ %{unitdir}/cups-lpd.socket
+ %{unitdir}/cups-lpd(a).service
+ %{prefix}/lib/daemon/cups-lpd
+ %{mandir}/man8/cups-lpd.8.gz
+ end
+
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script preun
+ systemctl --no-reload disable cups-lpd.socket >/dev/null 2>&1 || :
+ systemctl --no-reload disable cups-lpd(a).service >/dev/null 2>&1 || :
+ systemctl stop cups-lpd.socket >/dev/null 2>&1 || :
+ systemctl stop cups-lpd(a).service >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl try-restart cups-lpd(a).service >/dev/null 2>&1 || :
+ end
end
package %{name}-devel
@@ -90,6 +206,27 @@ packages
template LIBS
end
+ package %{name}-ipptool
+ summary = CUPS printing system - tool for performing IPP requests.
+ description
+ Sends IPP requests to the specified URI and tests and/or displays \
+ the results.
+ end
+
+ requires
+ %{name}-libs = %{thisver}
+ end
+
+ files
+ %{bindir}/ipptool
+ %{bindir}/ippfind
+ %{datadir}/cups/ipptool
+ %{datadir}/cups/ipptool/*
+ %{mandir}/man1/ipptool.1.gz
+ %{mandir}/man5/ipptoolfile.5.gz
+ end
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/cups/cups.tmpfiles b/cups/cups.tmpfiles
new file mode 100644
index 0000000..bcfba33
--- /dev/null
+++ b/cups/cups.tmpfiles
@@ -0,0 +1,4 @@
+d /run/cups 0755 root lp -
+d /run/cups/certs 0511 lp sys -
+
+d /var/spool/cups/tmp - - - 30d
diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm
index f3d6c31..5581d03 100644
--- a/dmraid/dmraid.nm
+++ b/dmraid/dmraid.nm
@@ -4,8 +4,8 @@
###############################################################################
name = dmraid
-version = 1.0.0.rc15
-release = 5
+version = 1.0.0.rc16
+release = 1
groups = System/Filesystems
url = http://people.redhat.com/heinzm/sw/dmraid
@@ -23,8 +23,7 @@ sources = %{thisapp}.tar.bz2
build
requires
- libdevmapper-devel
- libselinux-devel
+ libdevmapper-devel >= 2.02.166
end
DIR_APP = %{DIR_SRC}/%{name}/%{version}
@@ -34,8 +33,7 @@ build
configure_options += \
--disable-static \
- --disable-static_link \
- --enable-libselinux
+ --disable-static_link
# Dmraid doesn't automatically build and install a versioned library
# so we do it on or own.
@@ -43,6 +41,10 @@ build
make -C lib libdmraid.so
end
+ test
+ # Package does not offer any kind of testsuite.
+ end
+
install_cmds
# Install development headers.
mkdir -pv %{BUILDROOT}%{includedir}/dmraid
diff --git a/findutils/findutils.nm b/findutils/findutils.nm
index da3bca2..04d26e7 100644
--- a/findutils/findutils.nm
+++ b/findutils/findutils.nm
@@ -5,7 +5,7 @@
name = findutils
version = 4.6.0
-release = 1
+release = 2
groups = System/Tools
url = http://www.gnu.org/software/findutils/
@@ -28,7 +28,6 @@ build
autoconf
automake
gettext-devel
- libselinux-devel
end
prepare_cmds
diff --git a/fuse/fuse.nm b/fuse/fuse.nm
index 8db4447..37dbd20 100644
--- a/fuse/fuse.nm
+++ b/fuse/fuse.nm
@@ -5,7 +5,7 @@
name = fuse
version = 2.9.7
-release = 1
+release = 2
groups = System/Filesystems
url = http://fuse.sf.net/
@@ -21,10 +21,6 @@ end
source_dl = https://github.com/libfuse/libfuse/releases/download/%{thisapp}/
build
- requires
- libselinux-devel
- end
-
configure_options += \
--disable-static \
--disable-rpath
diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 444a2d1..26ad237 100644
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -4,8 +4,8 @@
###############################################################################
name = glib2
-ver_major = 2.48
-ver_minor = 0
+ver_major = 2.50
+ver_minor = 1
version = %{ver_major}.%{ver_minor}
release = 1
thisapp = glib-%{version}
@@ -31,14 +31,13 @@ build
requires
gettext
libffi-devel
- libselinux-devel
+ libmount-devel
pcre-devel
pkg-config
zlib-devel
end
configure_options += \
- --sysconfdir=/etc \
--with-pcre=system
install_cmds
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 5dd018d..0536639 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -5,7 +5,7 @@
name = glibc
version = 2.24
-release = 2
+release = 3
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Base
@@ -39,7 +39,6 @@ build
gettext
kernel-headers >= %{OPTIMIZED_KERNEL}
libcap-devel
- libselinux-devel
libstdc++-static
texinfo
end
@@ -91,7 +90,6 @@ build
--disable-profile \
--enable-add-ons \
--enable-kernel=%{OPTIMIZED_KERNEL} \
- --with-selinux \
--disable-werror \
--enable-bind-now \
--enable-obsolete-rpc \
diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm
index b05dd04..fc15edf 100644
--- a/libvirt/libvirt.nm
+++ b/libvirt/libvirt.nm
@@ -4,8 +4,8 @@
###############################################################################
name = libvirt
-version = 1.3.3
-release = 2
+version = 2.3.0
+release = 1
maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org>
groups = Applications/Virtualization
@@ -14,12 +14,12 @@ license = LGPLv2.1+
summary = A library for controlling VMs.
description
- A toolkit to interact with the virtualization capabilities of recent \
+ A toolkit to interact with the virtualization capabilities of recent
versions of Linux.
end
source_dl = ftp://libvirt.org/libvirt/
-sources = %{thisapp}.tar.gz
+sources = %{thisapp}.tar.xz
build
requires
@@ -29,7 +29,6 @@ build
libcurl-devel
libgcrypt-devel
libnl-devel
- libselinux-devel
libdevmapper-devel
libpciaccess-devel
libssh2-devel
@@ -65,8 +64,7 @@ build
--with-storage-disk \
--with-avahi \
--with-udev \
- --with-libvirtd \
- --with-selinux
+ --with-libvirtd
end
packages
diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm
index 02e4f84..de4bcec 100644
--- a/lvm2/lvm2.nm
+++ b/lvm2/lvm2.nm
@@ -4,7 +4,7 @@
###############################################################################
name = lvm2
-version = 2.02.147
+version = 2.02.166
release = 1
thisapp = LVM2.%{version}
@@ -27,26 +27,195 @@ sources = %{thisapp}.tgz
build
requires
- libselinux-devel
pkg-config
+ libblkid-devel
+ libudev-devel
ncurses-devel
readline-devel
+ systemd-devel
end
configure_options += \
+ --with-default-dm-run-dir=/run \
+ --with-default-run-dir=/run/lvm \
+ --with-default-pid-dir=/run/lvm \
+ --with-default-locking-dir=/run/lock/lvm \
--with-usrlibdir=%{libdir} \
- --enable-pkgconfig
+ --disable-lvm1_fallback \
+ --disable-selinux \
+ --enable-fsadm \
+ --with-pool=internal \
+ --enable-write_install \
+ --with-user= \
+ --with-group= \
+ --with-device-uid=0 \
+ --with-device-gid=6 \
+ --with-device-mode=0660 \
+ --enable-dmeventd \
+ --enable-blkid_wiping \
+ --enable-pkgconfig \
+ --enable-applib \
+ --enable-cmdlib \
+ --with-udevdir=%{prefix}/lib/udev/rules.d \
+ --enable-udev_sync
+
+ test
+ # Skip the testsuite, because it requires a mounted
+ # /tmp with support for block devices (without "nodev")
+ # and at least one available loopback device, which is not
+ # available in or chroot build environment.
+ end
+
+ install_cmds
+ make install_system_dirs DESTDIR=%{BUILDROOT}
+ make install_systemd_units DESTDIR=%{BUILDROOT}
+ make install_systemd_generators DESTDIR=%{BUILDROOT}
+ make install_tmpfiles_configuration DESTDIR=%{BUILDROOT}
+ end
end
packages
package %{name}
+ prerequires += \
+ systemd-units
+
+ requires
+ %{name}-libs = %{thisver}
+ end
+
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+
+ # Enable lvm2-monitor.service on completely new installations.
+ systemctl --no-reload enable lvm2-monitor.service >/dev/null 2>&1 || :
+ end
+
+ script preun
+ systemctl --no-reload disable lvm2-monitor.service >/dev/null 2>&1 || :
+ systemctl stop lvm2-monitor.service >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl try-restart lvm2-monitor.service >/dev/null 2>&1 || :
+ end
+ end
+
+ package %{name}-libs
+ template LIBS
+
+ requires
+ libdevmapper = %{thisver}
+ end
+
+ files += \
+ %{libdir}/libdevmapper-event-lvm2.so.* \
+ %{libdir}/device-mapper
+ end
+
+ package %{name}-devel
+ template DEVEL
+ end
+
+ package device-mapper
+ summary = Device mapper utility.
+ description
+ This package contains the supporting userspace utility, dmsetup,
+ for the kernel device-mapper and the dmeventd daemon for monitoring
+ the state of device-mapper devices.
+ end
+
+ prerequires += \
+ systemd-units
+
+ requires
+ libdevmapper = %{thisver}
+ util-linux >= 2.24
+ end
+
+ conflicts
+ dracut < 002
+ end
+
+ files
+ %{sbindir}/blkdeactivate
+ %{sbindir}/dmeventd
+ %{sbindir}/dmsetup
+ %{sbindir}/dmstats
+ %{mandir}/man8/blkdeactivate.8.gz
+ %{mandir}/man8/dmeventd.8.gz
+ %{mandir}/man8/dmsetup.8.gz
+ %{mandir}/man8/dmstats.8.gz
+ %{udevdir}/10-dm.rules
+ %{udevdir}/13-dm-disk.rules
+ %{udevdir}/95-dm-notify.rules
+ %{unitdir}/dm-event.socket
+ %{unitdir}/dm-event.service
+ end
+
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+
+ # dm-event.socket is always enabled and started and ready to
+ # serve if dmeventd is used.
+ systemctl --no-reload enable dm-event.socket >/dev/null 2>&1 || :
+ end
+
+ script preun
+ systemctl --no-reload disable dm-event.service >/dev/null 2>&1 || :
+ systemctl --no-reload disable dm-event.socket >/dev/null 2>&1 || :
+ systemctl stop dm-event.socket >/dev/null 2>&1 || :
+ systemctl stop dm-event.service >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ script postup
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl try-restart dm-event.service >/dev/null 2>&1 || :
+ end
+ end
package libdevmapper
template LIBS
+
+ summary = Device-mapper shared libraries.
+ description
+ This package contains the device-mapper shared libraries,
+ libdevmapper and libdevmapper-event.
+ end
+
+ files
+ %{libdir}/libdevmapper.so.*
+ %{libdir}/libdevmapper-event.so.*
+ end
end
package libdevmapper-devel
- template DEVEL
+ summary = Development libraries and headers for the device-mapper.
+ description
+ This package contains files needed to develop applications that use
+ the device-mapper libraries.
+ end
+
+ requires
+ libdevmapper = %{thisver}
+ end
+
+ files
+ %{libdir}/libdevmapper.so
+ %{libdir}/libdevmapper-event.so
+ %{includedir}/libdevmapper.h
+ %{includedir}/libdevmapper-event.h
+ %{libdir}/pkgconfig/devmapper.pc
+ %{libdir}/pkgconfig/devmapper-event.pc
+ end
end
package %{name}-debuginfo
diff --git a/patch/patch.nm b/patch/patch.nm
index 9a96a32..11d7251 100644
--- a/patch/patch.nm
+++ b/patch/patch.nm
@@ -4,7 +4,7 @@
###############################################################################
name = patch
-version = 2.7.1
+version = 2.7.5
release = 1
groups = Development/Tools
@@ -27,7 +27,6 @@ build
requires
attr-devel
ed
- libselinux-devel
pkg-config
end
diff --git a/procps-ng/procps-ng.nm b/procps-ng/procps-ng.nm
index 6760a9b..4392817 100644
--- a/procps-ng/procps-ng.nm
+++ b/procps-ng/procps-ng.nm
@@ -4,7 +4,7 @@
###############################################################################
name = procps-ng
-version = 3.3.10
+version = 3.3.12
release = 1
groups = Applications/System
@@ -24,7 +24,6 @@ sources = %{thisapp}.tar.xz
build
requires
gettext-devel
- libselinux-devel
ncurses-devel >= 5.9-11
end
@@ -35,8 +34,7 @@ build
--disable-modern-top \
--enable-watch8bit \
--enable-skill \
- --enable-sigwinch \
- --enable-libselinux
+ --enable-sigwinch
# Fix install path of some binaries.
make_install_targets += \
diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm
index 805ea84..99f3ba2 100644
--- a/psmisc/psmisc.nm
+++ b/psmisc/psmisc.nm
@@ -5,7 +5,7 @@
name = psmisc
version = 22.21
-release = 1
+release = 2
groups = Applications/System
url = http://sourceforge.net/projects/psmisc
@@ -26,12 +26,8 @@ source_dl = http://downloads.sourceforge.net/project/psmisc/psmisc/
build
requires
- libselinux-devel
ncurses-devel
end
-
- configure_options += \
- --enable-selinux
end
packages
diff --git a/python/patches/python-2.7.1-config.patch b/python/patches/python-2.7.1-config.patch
index 82fec2c..a119dcf 100644
--- a/python/patches/python-2.7.1-config.patch
+++ b/python/patches/python-2.7.1-config.patch
@@ -102,7 +102,7 @@
# First, look at Setup.config; configure may have set this for you.
-#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
-+crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
++crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
# Some more UNIX dependent modules -- off by default, since these
diff --git a/python/python.nm b/python/python.nm
index 0123eb9..5cba0a2 100644
--- a/python/python.nm
+++ b/python/python.nm
@@ -6,7 +6,7 @@
name = python
major_ver = 2.7
version = %{major_ver}.12
-release = 1
+release = 2
thisapp = Python-%{version}
groups = Development/Languages
diff --git a/qemu/qemu.nm b/qemu/qemu.nm
index 3499c4d..e04a4c0 100644
--- a/qemu/qemu.nm
+++ b/qemu/qemu.nm
@@ -3,12 +3,12 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-name = qemu-kvm
-version = 0.15.0
-release = 1
+name = qemu
+version = 2.7.0
+release = 2
groups = Applications/Virtualization
-url = http://www.linux-kvm.org/page/Main_Page
+url = http://www.qemu.org
license = GPLv2+
summary = QEMU is a generic and open source machine emulator and virtualizer.
@@ -18,31 +18,78 @@ description
architectures.
end
-source_dl =
+source_dl = http://wiki.qemu-project.org/download/
+sources = %{thisapp}.tar.bz2
build
requires
+ SDL-devel
+ autoconf
+ automake
+ bison
+ bzip2-devel
+ flex
glib2-devel
+ gnutls-devel
libcurl-devel
+ libgcrypt-devel
+ libjpeg-devel
+ libpng-devel
+ libtasn1-devel
+ libusb-devel
libuuid-devel
- gnutls-devel
+ lzo-devel
ncurses-devel
+ nettle-devel
pciutils-devel
- sdl-devel
+ pixman-devel
zlib-devel
end
+ qemu_native_platform = %{DISTRO_ARCH}
+
+ if "%{DISTRO_ARCH}" == "armv7hl"
+ qemu_native_platform = arm
+ end
+
+ targets = aarch64-softmmu arm-softmmu x86_64-softmmu
+
configure_options = \
- --prefix=/usr \
- --enable-kvm \
+ --prefix=%{prefix} \
+ --bindir=%{bindir} \
+ --sysconfdir=%{sysconfdir} \
+ --libdir=%{libdir} \
+ --libexecdir=%{libdir} \
+ --datadir=%{datadir} \
+ --mandir=%{mandir} \
+ --localstatedir=%{localstatedir} \
--extra-cflags="%{CFLAGS}" \
+ --extra-ldflags="%{LDFLAGS}" \
--disable-strip \
- --disable-xen \
- --sysconfdir=/etc \
- --target-list="i386-softmmu arm-softmmu"
+ --disable-werror \
+ --target-list="%{targets}" \
+ --enable-bzip2 \
+ --enable-fdt \
+ --enable-kvm \
+ --enable-libusb \
+ --enable-lzo \
+ --enable-pie \
+ --enable-vhdx \
+ --enable-vnc \
+ --enable-vnc-jpeg \
+ --enable-vnc-png \
+ --disable-xen
configure_cmds
- sed -e "s(a)-Wl,-rpath,/usr/lib@@g" -i */config-target.mak
+ sed -e "s(a)-Wl,-rpath,%{libdir}@@g" -i config-host.mak
+ end
+
+ install_cmds
+ # Remove BIOS file which is an ELF files w/ invalid interpreter
+ rm -vf %{BUILDROOT}%{datadir}/qemu/s390-ccw.img
+
+ # Remove ivshm stuff
+ rm -vf %{BUILDROOT}%{bindir}/ivshmem* %{BUILDROOT}%{mandir}/ivshmem*
end
end
@@ -54,6 +101,57 @@ end
packages
package %{name}
+ # Always install the native package (for KVM)
+ requires
+ qemu-%{qemu_native_platform} = %{thisver}
+ end
+
+ recommends
+ qemu-img = %{thisver}
+ end
+ end
+
+ template QEMUARCH
+ summary = QEMU for %{qemu_arch}
+ description = %{summary}
+
+ requires = %{name} = %{thisver}
+
+ files
+ %{bindir}/qemu-system-%{qemu_arch}
+ %{mandir}/man1/qemu-system-%{qemu_arch}.1*
+ end
+ end
+
+ package %{name}-aarch64
+ template QEMUARCH
+ qemu_arch = aarch64
+ end
+
+ package %{name}-arm
+ template QEMUARCH
+ qemu_arch = arm
+ end
+
+ package %{name}-x86_64
+ template QEMUARCH
+ qemu_arch = x86_64
+ end
+
+ package %{name}-img
+ summary = QEMU command line tool for manipulating disk images
+ description
+ This package provides a command line tool for manipulating disk images
+ end
+
+ files
+ %{bindir}/qemu-img
+ %{bindir}/qemu-io
+ %{bindir}/qemu-nbd
+ %{mandir}/man1/qemu-img.1*
+ %{mandir}/man8/qemu-nbd.8*
+ end
+ end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/tar/tar.nm b/tar/tar.nm
index 3b400cf..26a1019 100644
--- a/tar/tar.nm
+++ b/tar/tar.nm
@@ -5,7 +5,7 @@
name = tar
version = 1.29
-release = 1
+release = 2
groups = System/Packaging
url = http://www.gnu.org/software/tar/
@@ -35,13 +35,11 @@ build
gettext-devel
libacl-devel
libattr-devel
- libselinux-devel
texinfo
end
configure_options += \
--libexecdir=/usr/sbin \
- --enable-selinux \
FORCE_UNSAFE_CONFIGURE=1
prepare_cmds
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 1f76208..c7cb4a0 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-tzdata_version = 2016g
-tzcode_version = 2016g
+tzdata_version = 2016h
+tzcode_version = 2016h
name = tzdata
version = %{tzdata_version}
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2016-10-21 13:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161021132020.CA6211081BA5@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox