apmd: upgrade to 3.2.2-14

[Patches]
  KEEP    _unlinux.patch_: remove reference to build system paths
  DISABLE _libtool.patch_: this patch adds a "--tag=CC" to be compatible with libtool2.2.4.
                           however with latest 2.2.10 libtool, w/o this patch it still works. From
                           the manual, CC is the default tag actually. So disable it for now, and once
                           same error happens again, it'll be re-neabled and if necessary push to upstream
  DISABLE _workaround.patch_: a SIGUSR1 is hooked to signal suspend event as a so-called 'workaround'.
                              however no exact commit is found for exact usage case. So disable it.
  REMOVE  _debian.patch_: in upstream

[Recipe]
  Add license checksum

Signed-off-by: Kevin Tian <kevin.tian@intel.com>

8 files changed, 0 insertions, 296 deletions

diff --git a/meta/packages/apmd/apmd-3.2.2/apmd_proxy b/meta/packages/apmd/apmd-3.2.2/apmd_proxy
deleted file mode 100644
index c48ee4e5d5..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/apmd_proxy
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-# 
-# apmd_proxy - program dispatcher for APM daemon
-#
-# Written by Craig Markwardt (craigm@lheamail.gsfc.nasa.gov) 21 May 1999
-# Modified for Debian by Avery Pennarun
-#
-# This shell script is called by the APM daemon (apmd) when a power
-# management event occurs.  Its first and second arguments describe the
-# event.  For example, apmd will call "apmd_proxy suspend system" just
-# before the system is suspended.
-#
-# Here are the possible arguments:
-#
-# start              - APM daemon has started
-# stop               - APM daemon is shutting down
-# suspend critical   - APM system indicates critical suspend (++)
-# suspend system     - APM system has requested suspend mode
-# suspend user       - User has requested suspend mode
-# standby system     - APM system has requested standby mode 
-# standby user       - User has requested standby mode
-# resume suspend     - System has resumed from suspend mode
-# resume standby     - System has resumed from standby mode
-# resume critical    - System has resumed from critical suspend
-# change battery     - APM system reported low battery
-# change power       - APM system reported AC/battery change
-# change time        - APM system reported time change (*)
-# change capability  - APM system reported config. change (+)
-#
-# (*) - APM daemon may be configured to not call these sequences
-# (+) - Available if APM kernel supports it.
-# (++) - "suspend critical" is never passed to apmd from the kernel,
-#   so we will never see it here.  Scripts that process "resume
-#   critical" events need to take this into account.
-#
-# It is the proxy script's responsibility to examine the APM status
-# (via /proc/apm) or other status and to take appropriate actions.
-# For example, the script might unmount network drives before the
-# machine is suspended.
-#
-# In Debian, the usual way of adding functionality to the proxy is to
-# add a script to /etc/apm/event.d.  This script will be called by
-# apmd_proxy (via run-parts) with the same arguments.
-#
-# If it is important that a certain set of script be run in a certain
-# order on suspend and in a different order on resume, then put all
-# the scripts in /etc/apm/scripts.d instead of /etc/apm/event.d and
-# symlink to these from /etc/apm/suspend.d, /etc/apm/resume.d and
-# /etc/apm/other.d using names whose lexicographical order is the same
-# as the desired order of execution.
-#
-# If the kernel's APM driver supports it, apmd_proxy can return a non-zero
-# exit status on suspend and standby events, indicating that the suspend
-# or standby event should be rejected.
-#
-# *******************************************************************
-
-set -e
-
-# The following doesn't yet work, because current kernels (up to at least
-# 2.4.20) do not support rejection of APM events.  Supporting this would
-# require substantial modifications to the APM driver.  We will re-enable
-# this feature if the driver is ever modified.       -- cph@debian.org
-#
-#SUSPEND_ON_AC=false
-#[ -r /etc/apm/apmd_proxy.conf ] && . /etc/apm/apmd_proxy.conf
-#
-#if [ "${SUSPEND_ON_AC}" = "false" -a "${2}" = "system" ] \
-#       && on_ac_power >/dev/null; then
-#    # Reject system suspends and standbys if we are on AC power
-#    exit 1  # Reject (NOTE kernel support must be enabled)
-#fi
-
-if [ "${1}" = "suspend" -o "${1}" = "standby" ]; then
-    run-parts -a "${1}" -a "${2}" /etc/apm/event.d
-    if [ -d /etc/apm/suspend.d ]; then
-        run-parts -a "${1}" -a "${2}" /etc/apm/suspend.d
-    fi
-elif [ "${1}" = "resume" ]; then
-    if [ -d /etc/apm/resume.d ]; then
-        run-parts -a "${1}" -a "${2}" /etc/apm/resume.d
-    fi
-    run-parts -a "${1}" -a "${2}" /etc/apm/event.d
-else
-    run-parts -a "${1}" -a "${2}" /etc/apm/event.d
-    if [ -d /etc/apm/other.d ]; then
-        run-parts -a "${1}" -a "${2}" /etc/apm/other.d
-    fi
-fi
-
-exit 0
diff --git a/meta/packages/apmd/apmd-3.2.2/apmd_proxy.conf b/meta/packages/apmd/apmd-3.2.2/apmd_proxy.conf
deleted file mode 100644
index 751145c522..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/apmd_proxy.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/apm/apmd_proxy.conf: configuration file for apmd.
-#
-# This file is managed by debconf when installing or reconfiguring the
-# package.  It is generated by merging the answers gathered by debconf
-# into the template file "/usr/share/apmd/apmd_proxy.conf".
-
-# The following doesn't yet work, because current kernels (up to at least
-# 2.4.20) do not support rejection of APM events.  Supporting this would
-# require substantial modifications to the APM driver.  We will re-enable
-# this feature if the driver is ever modified.       -- cph@debian.org
-#
-# Set the following to "false" if you want to reject system suspend or
-# system standby requests when the computer is running on AC power.
-# Otherwise set this to "true".  Such requests are never rejected when
-# the computer is running on battery power.
-#SUSPEND_ON_AC=true
diff --git a/meta/packages/apmd/apmd-3.2.2/debian.patch b/meta/packages/apmd/apmd-3.2.2/debian.patch
deleted file mode 100644
index d49e524bbd..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/debian.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- apmd-3.2.2.orig/apmd.c
-+++ apmd-3.2.2/apmd.c
-@@ -343,7 +343,7 @@
-                /* parent */
-                int status, retval;
-                ssize_t len;
--               time_t time_limit;
-+               time_t countdown;
- 
-                if (pid < 0) {
-                        /* Couldn't fork */
-@@ -356,8 +356,9 @@
-                /* Capture the child's output, if any, but only until it terminates */
-                close(fds[1]);
-                fcntl(fds[0], F_SETFL, O_RDONLY|O_NONBLOCK);
--               time_limit = time(0) + proxy_timeout;
-+               countdown = proxy_timeout;
-                do {
-+                       countdown -= 1;
-                        while ((len = read(fds[0], line, sizeof(line)-1)) > 0) {
-                                line[len] = 0;
-                                APMD_SYSLOG(LOG_INFO, "+ %s", line);
-@@ -372,16 +373,16 @@
-                                goto proxy_done;
-                        }
-                                
--                       sleep(1);
-+                       while (sleep(1) > 0) ;
-                } while (
--                       (time(0) < time_limit)
-+                       (countdown >= 0)
-                        || (proxy_timeout < 0)
-                );
- 
-                APMD_SYSLOG(LOG_NOTICE, "Proxy has been running more than %d seconds; killing it", proxy_timeout);
- 
-                kill(pid, SIGTERM);
--               time_limit = time(0) + 5;
-+               countdown = 5;
-                do {
-                        retval = waitpid(pid, &status, WNOHANG);
-                        if (retval == pid)
-@@ -392,9 +393,9 @@
-                                goto proxy_done;
-                        }
- 
--                       sleep(1);
-+                       while (sleep(1) > 0) ;
- 
--               } while (time(0) < time_limit);
-+               } while (countdown >= 0);
- 
-                kill(pid, SIGKILL);
-                status = __W_EXITCODE(0, SIGKILL);
diff --git a/meta/packages/apmd/apmd-3.2.2/default b/meta/packages/apmd/apmd-3.2.2/default
deleted file mode 100644
index 4b7965abf8..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/default
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Default for /etc/init.d/apmd
-#
-
-# As apmd can be called with arguments, we use the following variable
-# to store them, e.g., APMD="-w 5 -p 2".
-# See the manual page apmd(8) for details.
-APMD="--proxy-timeout 30"
diff --git a/meta/packages/apmd/apmd-3.2.2/init b/meta/packages/apmd/apmd-3.2.2/init
deleted file mode 100755
index 268d4b26b7..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/init
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          apmd
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Advanced Power Management daemon
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-[ -f /etc/default/apmd ] && . /etc/default/apmd
-
-case "$1" in
-    start)
-        echo -n "Starting advanced power management daemon: "
-        start-stop-daemon -S -x /usr/sbin/apmd -- \
-                -P /etc/apm/apmd_proxy $APMD
-        if [ $? = 0 ]; then
-            echo "apmd."
-        else
-            echo "(failed.)"
-        fi
-        ;;
-    stop)
-        echo -n "Stopping advanced power management daemon: "
-        start-stop-daemon -K \
-                -x /usr/sbin/apmd
-        echo "apmd."
-        ;;
-    restart|force-reload) 
-        $0 stop
-        $0 start
-        exit
-        ;;
-    *)
-        echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/meta/packages/apmd/apmd-3.2.2/libtool.patch b/meta/packages/apmd/apmd-3.2.2/libtool.patch
deleted file mode 100644
index bf8a373b63..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/libtool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: apmd-3.2.2.orig/Makefile
-===================================================================
---- apmd-3.2.2.orig.orig/Makefile       2004-01-04 08:13:18.000000000 +0000
-+++ apmd-3.2.2.orig/Makefile    2008-04-21 17:10:03.000000000 +0100
-@@ -58,9 +57,8 @@
- #CFLAGS=-O3 -m486 -fomit-frame-pointer
- #LDFLAGS=-s
- 
--LIBTOOL=libtool --quiet
--LT_COMPILE = $(LIBTOOL) --mode=compile $(CC)
--LT_LINK = $(LIBTOOL) --mode=link $(CC)
-+LT_COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC)
-+LT_LINK = $(LIBTOOL)  --tag=CC --mode=link $(CC)
- LT_INSTALL = $(LIBTOOL) --mode=install install
- LT_CLEAN = $(LIBTOOL) --mode=clean rm
- 
diff --git a/meta/packages/apmd/apmd-3.2.2/unlinux.patch b/meta/packages/apmd/apmd-3.2.2/unlinux.patch
deleted file mode 100644
index f7eec6eb03..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/unlinux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- apmd-3.2.2.orig/Makefile
-+++ apmd-3.2.2/Makefile
-@@ -43,8 +43,7 @@
- 
- CC=gcc
- CFLAGS=-O -g
--XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \
--               -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
-+XTRACFLAGS=-Wall -pipe -I. \
-                -DVERSION=\"$(VERSION)\" \
-                -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\"
- LDFLAGS=
diff --git a/meta/packages/apmd/apmd-3.2.2/workaround.patch b/meta/packages/apmd/apmd-3.2.2/workaround.patch
deleted file mode 100644
index 19cf073115..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/workaround.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- apmd-3.2.2.orig/apmd.c~workaround.patch
-+++ apmd-3.2.2.orig/apmd.c
-@@ -158,6 +158,7 @@
- static int quiet_bios_batlow; /* = 0 */
- static int verbosity = DEFAULT_VERBOSITY;
- static int warn_level = 10;
-+static int sleep_now = 0;      /* ntp */
- 
- static uid_t apmd_uid = 0;
- static int apmd_fd = -1;
-@@ -942,6 +943,12 @@
-        exit(0);
- }
- 
-+/* ntp */
-+static void sig_usr1(int sig)
-+{
-+  sleep_now = 1;
-+}
-+
- int main(int argc, char **argv)
- {
-        int c;
-@@ -1151,6 +1158,8 @@
-        openlog("apmd", (verbosity>=LOG_DEBUG)?LOG_PERROR:0 | LOG_PID | LOG_CONS, LOG_DAEMON);
- 
-        /* Set up signal handler */
-+       if (signal(SIGUSR1, SIG_IGN) != SIG_IGN)
-+               signal(SIGUSR1, sig_usr1);      /* ntp */
-        if (signal(SIGINT, SIG_IGN) != SIG_IGN)
-                signal(SIGINT, sig_handler);
-        if (signal(SIGQUIT, SIG_IGN) != SIG_IGN)
-@@ -1230,9 +1239,16 @@
- 
-        for (;;)
-        {
--               int num_events = apm_get_events(apmd_fd, check_interval, events, MAX_EVENTS);
-+               int num_events;
-                int e, a;
- 
-+               /* ntp */
-+               if (sleep_now) {
-+                       sleep_now = 0;
-+                       handle_event(APM_USER_SUSPEND, &apminfo);
-+               }
-+
-+               num_events = apm_get_events(apmd_fd, check_interval, events, MAX_EVENTS);
-                apm_read(&apminfo);
- 
-                if (num_events == 0) {