From: Marcel Lorenz <marcel.lorenz@ipfire.org>
Date: Sun, 26 Jun 2016 07:58:14 +0000 (+0200)
Subject: acpid: update to 2.0.26
X-Git-Tag: v2.19-core104~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa3ff233c2895c0f0aa32d957e7403b108e9fb2b;p=ipfire-2.x.git

acpid: update to 2.0.26

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/i586/acpid b/config/rootfiles/common/i586/acpid
index 535e2bdcc3..85a110de8f 100644
--- a/config/rootfiles/common/i586/acpid
+++ b/config/rootfiles/common/i586/acpid
@@ -6,12 +6,12 @@ etc/acpi/events/power
 usr/bin/acpi_listen
 usr/sbin/acpid
 #usr/sbin/kacpimon
-#usr/share/doc/acpid
-#usr/share/doc/acpid/COPYING
-#usr/share/doc/acpid/Changelog
-#usr/share/doc/acpid/README
-#usr/share/doc/acpid/TESTPLAN
-#usr/share/doc/acpid/TODO
+#usr/share/doc/acpid-2.0.26
+#usr/share/doc/acpid-2.0.26/COPYING
+#usr/share/doc/acpid-2.0.26/Changelog
+#usr/share/doc/acpid-2.0.26/README
+#usr/share/doc/acpid-2.0.26/TESTPLAN
+#usr/share/doc/acpid-2.0.26/TODO
 #usr/share/man/man8/acpi_listen.8
 #usr/share/man/man8/acpid.8
 #usr/share/man/man8/kacpimon.8
diff --git a/config/rootfiles/common/x86_64/acpid b/config/rootfiles/common/x86_64/acpid
index 535e2bdcc3..85a110de8f 100644
--- a/config/rootfiles/common/x86_64/acpid
+++ b/config/rootfiles/common/x86_64/acpid
@@ -6,12 +6,12 @@ etc/acpi/events/power
 usr/bin/acpi_listen
 usr/sbin/acpid
 #usr/sbin/kacpimon
-#usr/share/doc/acpid
-#usr/share/doc/acpid/COPYING
-#usr/share/doc/acpid/Changelog
-#usr/share/doc/acpid/README
-#usr/share/doc/acpid/TESTPLAN
-#usr/share/doc/acpid/TODO
+#usr/share/doc/acpid-2.0.26
+#usr/share/doc/acpid-2.0.26/COPYING
+#usr/share/doc/acpid-2.0.26/Changelog
+#usr/share/doc/acpid-2.0.26/README
+#usr/share/doc/acpid-2.0.26/TESTPLAN
+#usr/share/doc/acpid-2.0.26/TODO
 #usr/share/man/man8/acpi_listen.8
 #usr/share/man/man8/acpid.8
 #usr/share/man/man8/kacpimon.8
diff --git a/lfs/acpid b/lfs/acpid
index 476c9a8b63..9169857a56 100644
--- a/lfs/acpid
+++ b/lfs/acpid
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.23
+VER        = 2.0.26
 
 THISAPP    = acpid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d7bcdcdefcd53b03730e50ba842554ea
+$(DL_FILE)_MD5 = f6d772e35ed907f1cc14ad1a546fd473
 
 install : $(TARGET)
 
@@ -71,7 +71,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+		--docdir=/usr/share/doc/acpid-2.0.26
 	cd $(DIR_APP) && make $(MAKETUNING) OPT="$(CFLAGS)"
 	cd $(DIR_APP) && make install