Merge remote-tracking branch 'maniacikarus/ids'

diff --git a/autoconf/autoconf.nm b/autoconf/autoconf.nm
index 295d64c2795326af4116657b72b75b3af333ccba..cb08c29740f555a5aa3ece3927e074f635ad4e42 100644 (file)
--- a/autoconf/autoconf.nm
+++ b/autoconf/autoconf.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = autoconf
-version    = 2.68
-release    = 2
+version    = 2.69
+release    = 1
 arch       = noarch
 
 groups     = Development/Tools

diff --git a/automake/automake.nm b/automake/automake.nm
index 6ec57cc6fa9b4417e8c9c98545d35112fab01cba..cc3954432bdc64cc981bb6fcbbd84f1790ad6f96 100644 (file)
--- a/automake/automake.nm
+++ b/automake/automake.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = automake
-version    = 1.11.4
+version    = 1.12
 release    = 1
 arch       = noarch
 

diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm
index 14040f78593975e87b35a9aa540ab9932c3af726..b8c52079621de592bc9e511cb7902d07b2864718 100644 (file)
--- a/ghostscript/ghostscript.nm
+++ b/ghostscript/ghostscript.nm
@@ -5,7 +5,7 @@
 
 name       = ghostscript
 version    = 9.05
-release    = 2
+release    = 2.1
 
 groups     = Applications/Printing
 url        = http://ghostscript.com
@@ -30,7 +30,6 @@ source_dl  = http://downloads.ghostscript.com/public/
 
 build
        requires
-               cups-devel
                dbus-devel
                expat-devel
                glib2-devel

diff --git a/ipfire-logos/ipfire-logos.nm b/ipfire-logos/ipfire-logos.nm
index 9947523222c5b724a6d42c58fc8af25838f24db1..45e5aa5e38aaa502502a8a5ad099526d208c3547 100644 (file)
--- a/ipfire-logos/ipfire-logos.nm
+++ b/ipfire-logos/ipfire-logos.nm
@@ -5,7 +5,7 @@
 
 name       = ipfire-logos
 version    = 1
-release    = 1
+release    = 2
 arch       = noarch
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -31,5 +31,24 @@ end
 packages
        package %{name}
                provides = system-logos
+
+               prerequires
+                       plymouth-scripts
+               end
+
+               requires
+                       plymouth-plugin-script
+               end
+
+               script postin
+                       %{sbindir}/plymouth-set-default-theme ipfire-logo || :
+               end
+
+               script postun
+                       if [ "$(%{sbindir}/plymouth-set-default-theme)" = "ipfire-logo" ]; then
+                               %{sbindir}/plymouth-set-default-theme --reset
+                               /usr/lib/plymouth/plymouth-generate-initrd
+                       fi
+               end
        end
 end

diff --git a/ipfire-release/ipfire-release.nm b/ipfire-release/ipfire-release.nm
index bd0e4517ff3b76f02ab7a00da7c8c5b0a9d1f643..220cbc279494f7859110db48c57fbe652254c34f 100644 (file)
--- a/ipfire-release/ipfire-release.nm
+++ b/ipfire-release/ipfire-release.nm
@@ -14,7 +14,7 @@ DISTRO_COLOR    = 0;31
 
 name       = %{DISTRO_SNAME}-release
 version    = %{DISTRO_VERSION}
-release    = 2
+release    = 3
 epoch      = 3
 arch       = noarch
 

diff --git a/ipfire-release/repos/stable.repo b/ipfire-release/repos/stable.repo
index 2e34475669baec95d6ea5fe18745ead784af924c..d8f86fc6af3e47cf6c80811258464a81e4e743d9 100644 (file)
--- a/ipfire-release/repos/stable.repo
+++ b/ipfire-release/repos/stable.repo
@@ -3,4 +3,3 @@ description = IPFire 3 - Stable repository.
 enabled = 1
 baseurl = http://pakfire.ipfire.org/repositories/ipfire3/stable/%{arch}
 mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/stable/mirrorlist?arch=%{arch}
-priority = 500

diff --git a/ipfire-release/repos/testing.repo b/ipfire-release/repos/testing.repo
index 63b3674239daed63875707c25d14b5211c111cc0..a1bbb26ea564aa78be6217cf07f6ef34c31f72e2 100644 (file)
--- a/ipfire-release/repos/testing.repo
+++ b/ipfire-release/repos/testing.repo
@@ -3,4 +3,3 @@ description = IPFire 3 - This is a repository for testing stuff.
 enabled = 0
 baseurl = http://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch}
 mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{arch}
-priority = 100

diff --git a/ipfire-release/repos/unstable.repo b/ipfire-release/repos/unstable.repo
index 76ea412017aa0ce025caa7df2ba6a83e7f01abaf..44b11adb121f7f932e64d59e56e8e45813c258ef 100644 (file)
--- a/ipfire-release/repos/unstable.repo
+++ b/ipfire-release/repos/unstable.repo
@@ -3,4 +3,3 @@ description = IPFire 3 - Public unstable repository.
 enabled = 0
 baseurl = http://pakfire.ipfire.org/repositories/ipfire3/unstable/%{arch}
 mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/unstable/mirrorlist?arch=%{arch}
-priority = 200

diff --git a/samba/samba.nm b/samba/samba.nm
index 5902b9b1bc417b3e3bde8ca175098178f1924183..6403e4ce50e6bf59cf4553244d8bd9105112d89a 100644 (file)
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = samba
-version    = 3.6.3
-release    = 2
+version    = 3.6.4
+release    = 1
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 95bf4f744132d65aee6e31538b32bd59c770c197..29983e4441aa579466d634c185b54ce50b0fff27 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 44
-release    = 4
+release    = 6
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -95,14 +95,6 @@ build
                        ln -svf ../system/${i}.target ${i}.target || exit 1
                done
 
-               # Replace absolute symlink for getty@tty1.service.
-               ln -svf ../../../../%{unitdir}/getty@.service \
-                       %{BUILDROOT}%{sysconfdir}/systemd/system/getty.target.wants/getty@tty1.service
-
-               # Replace absolute symlink for remote-fs.target.
-               ln -svf ../../../../%{unitdir}/remote-fs.target \
-                       %{BUILDROOT}%{sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target
-
                # Remove tmpfile for X11
                rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
 
@@ -152,10 +144,18 @@ packages
                                # Try harder
                                grep -q pam_systemd /etc/pam.d/system-auth-ac || authconfig --updateall --nostart >/dev/null 2>&1 || :
                        fi
+
+                       /usr/bin/systemctl enable \
+                               getty@.service \
+                               remote-fs.target \
+                               systemd-readahead-replay.service \
+                               systemd-readahead-collect.service \
+                               >/dev/null 2>&1 || :
                end
 
                script postup
                        # Restart login service after update
+                       /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
                        /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
                end
        end

diff --git a/wavemon/wavemon.nm b/wavemon/wavemon.nm
index ea4f1a0d2c772422caf640ca98cd9cebbf4ad7e3..1ec862cd65507a34b0c080412fbe0a10b74bc25e 100644 (file)
--- a/wavemon/wavemon.nm
+++ b/wavemon/wavemon.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = wavemon
-version    = 0.7.2
+version    = 0.7.4
 release    = 1
 
 groups     = Applications/Internet