Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ac3d91324f642950c41d84f7d06e9c9119ed40e

commit 5ac3d91324f642950c41d84f7d06e9c9119ed40e
Author: DeX77 <[email protected]>
Date:   Mon Feb 2 14:09:06 2015 +0100

systemd-208-7-x86_64

* fix man-db patch

diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index 8aaca56..9d569b6 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -6,7 +6,7 @@ USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"}

pkgname=systemd
pkgver=208
-pkgrel=6
+pkgrel=7
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
rodepends=('scriptlet-core')
@@ -29,8 +29,7 @@ 
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz \
vconsole.conf \
xorg-set-resolution.c \
xorg-set-resolution.service \
-        0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch \
-       man-db-cleanup-doublette-fix.patch )
+        0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch)
sha1sums=('e1a4e213d5d1e3498bca851347f2f07fdb9b4e1f' \
'0c19e1f5c4e528a4017d39812badacce5429e1b8' \
'8ee24b6906739855a48aded896a0f12154815343' \
@@ -43,8 +42,7 @@ sha1sums=('e1a4e213d5d1e3498bca851347f2f07fdb9b4e1f' \
'66c90190613ef915e5b2b1da37abd19791f7b16d' \
'a29bf4a084ae46e9d995b6616ad5980ff0030c82' \
'58dfc8f9e97b34413e6163c8a4713df67bdead5b' \
-          '3e98b60aa0541acfaab636b70c68ee2da11bfaff' \
-          'e1f387555452f2071e0565e1feb723dbe53ac366')
+          '3e98b60aa0541acfaab636b70c68ee2da11bfaff')

if Fuse $USE_CRYPTSETUP; then
depends=("${depends[@]}"  'cryptsetup-luks>=1.6.3-3')
@@ -80,6 +78,10 @@ build()
unset MAKEFLAGS
#build systemd
Fpatchall
+
+       #TODO Remove after Bump to >= 215
+       sed '/var\/cache\/man/d' tmpfiles.d/systemd.conf || Fdie
+
Fautoreconf
Fmake --disable-tcpwrap
Fmakeinstall
diff --git a/source/base/systemd/man-db-cleanup-doublette-fix.patch 
b/source/base/systemd/man-db-cleanup-doublette-fix.patch
deleted file mode 100644
index 5c0a179..0000000
--- a/source/base/systemd/man-db-cleanup-doublette-fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 553d2243e2a42783b8bb94addfb752b802c23311 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]>
-Date: Tue, 6 Jan 2015 00:29:40 -0500
-Subject: tree-wide: remove unnecessary LOG_PRI
-
-LOG_DEBUG is already a log level, there is no need to use LOG_PRI which
-is for filtering out the facility.
-
-diff --git a/src/core/execute.c b/src/core/execute.c
-index 51e1e87..0af4227 100644
---- a/src/core/execute.c
-+++ b/src/core/execute.c
-@@ -797,7 +797,7 @@ static int setup_pam(
-          * daemon. We do things this way to ensure that the main PID
-          * of the daemon is the one we initially fork()ed. */
-
--        if (log_get_max_level() < LOG_PRI(LOG_DEBUG))
-+        if (log_get_max_level() < LOG_DEBUG)
-                 flags |= PAM_SILENT;
-
-         pam_code = pam_start(name, user, &conv, &handle);
-@@ -1782,7 +1782,7 @@ static int exec_child(ExecCommand *command,
-
-         final_env = strv_env_clean(final_env);
-
--        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
-+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
-                 _cleanup_free_ char *line;
-
-                 line = exec_command_line(final_argv);
-diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
-index 756e793..afb39ad 100644
---- a/src/journal/coredumpctl.c
-+++ b/src/journal/coredumpctl.c
-@@ -822,7 +822,7 @@ int main(int argc, char *argv[]) {
-                 }
-         }
-
--        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
-+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
-                 _cleanup_free_ char *filter;
-
-                 filter = journal_make_match_string(j);
-diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index c91f2cf..386e350 100644
---- a/src/journal/journalctl.c
-+++ b/src/journal/journalctl.c
-@@ -1875,7 +1875,7 @@ int main(int argc, char *argv[]) {
-                 return EXIT_FAILURE;
-         }
-
--        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
-+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
-                 _cleanup_free_ char *filter;
-
-                 filter = journal_make_match_string(j);
-diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
-index 98972ed..dff0d30 100644
---- a/src/shared/logs-show.c
-+++ b/src/shared/logs-show.c
-@@ -1263,7 +1263,7 @@ int show_journal_by_unit(
-         if (r < 0)
-                 return r;
-
--        if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
-+        if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
-                 _cleanup_free_ char *filter;
-
-                 filter = journal_make_match_string(j);
---
-cgit v0.10.2
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to