Hello community, here is the log from the commit of package acpid for openSUSE:Factory checked in at 2015-09-30 05:52:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acpid (Old) and /work/SRC/openSUSE:Factory/.acpid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "acpid" Changes: -------- --- /work/SRC/openSUSE:Factory/acpid/acpid.changes 2014-12-19 09:37:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.acpid.new/acpid.changes 2015-09-30 05:52:24.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Sep 26 10:51:13 UTC 2015 - mpluskal@suse.com + +- Update to 2.0.25 + * Remove release process from README. + * Fix missing libc_compat.h in release tarball. +- Changes for 2.0.24 + * Avoid using SW_VIDEOOUT_INSERT if it isn't available. + * Add support for Copy and Restart keys. + * Add support for non-glibc libc's. + * Fix compiler warnings. + * Add systemd info to documentation. +- Update project url +- Cleanup spec file with spec-cleaner +- Obey default CFLAGS + +------------------------------------------------------------------- Old: ---- acpid-2.0.23.tar.xz New: ---- acpid-2.0.25.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.yBN8nS/_old 2015-09-30 05:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.yBN8nS/_new 2015-09-30 05:52:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package acpid # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: acpid -Version: 2.0.23 +Version: 2.0.25 Release: 0 Summary: Executes Actions at ACPI Events License: GPL-2.0+ Group: System/Daemons -Url: http://tedfelix.com/linux/acpid-netlink.html +Url: http://sourceforge.net/projects/acpid2/ Source: http://downloads.sourceforge.net/project/acpid2/%{name}-%{version}.tar.xz Source3: README.SUSE Source5: events.power_button @@ -32,7 +32,6 @@ Source9: events.thinkpad Source10: events.sleep_button Source11: sleep_button - # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: acpid-makefile.patch BuildRequires: systemd-rpm-macros @@ -54,13 +53,14 @@ cp %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} . %build +export CFLAGS="%{optflags}" export LDFLAGS="-Wl,-z,relro,-z,now" %configure make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir} -install -Dm 744 thinkpad_handler %{buildroot}%{_prefix}/lib/acpid/thinkpad_handler +install -Dm 744 thinkpad_handler %{buildroot}%{_libexecdir}/acpid/thinkpad_handler install -Dm 644 events.thinkpad %{buildroot}%{_sysconfdir}/acpi/events/thinkpad mkdir -p %{buildroot}/%{_unitdir} install -m 644 %{SOURCE8} %{buildroot}/%{_unitdir} @@ -91,8 +91,8 @@ %dir %{_sysconfdir}/acpi %dir %{_sysconfdir}/acpi/events %{_sysconfdir}/acpi/events/thinkpad -%{_prefix}/lib/acpid -%_unitdir/%{name}.service +%{_libexecdir}/acpid +%{_unitdir}/%{name}.service %{_sbindir}/rcacpid %{_sbindir}/acpid %{_sbindir}/kacpimon ++++++ acpid-2.0.23.tar.xz -> acpid-2.0.25.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/Changelog new/acpid-2.0.25/Changelog --- old/acpid-2.0.23/Changelog 2014-08-23 19:51:13.000000000 +0200 +++ new/acpid-2.0.25/Changelog 2015-08-17 01:04:51.000000000 +0200 @@ -1,3 +1,27 @@ +* Sun Aug 16 2015 Ted Felix <ted@tedfelix.com> + - 2.0.25 release + (configure.ac) (Ted Felix) + - Remove release process from README. + (README) (Ted Felix) + - Fix missing libc_compat.h in release tarball. + (Makefile.am kacpimon/Makefile.am kacpimon/libc_compat.h) + (Ted Felix) + +* Sat Aug 15 2015 Ted Felix <ted@tedfelix.com> + - 2.0.24 release + (configure.ac) (Ted Felix) + - Avoid using SW_VIDEOOUT_INSERT if it isn't available. (input_layer.c) + (Bostjan Skufca <bostjan@a2o.si>) + - Add support for Copy and Restart keys. (input_layer.c) + (Andrey Kuznetsov) + - Add support for non-glibc libc's. (acpi_listen.c acpid.c event.c + input_layer.c kacpimon/libnetlink.h libc_compat.h libnetlink.c netlink.c + proc.c ud_socket.c) (Brendan Heading <brendanheading@gmail.com>) + - Fix compiler warnings. (acpi_listen.c event.c sock.c) + (Brendan Heading <brendanheading@gmail.com>) + - Add systemd info to documentation. (README TESTPLAN) + (Ted Felix) + * Sat Aug 23 2014 Ted Felix <ted@tedfelix.com> - 2.0.23 release (configure.ac) (Ted Felix) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/Makefile.am new/acpid-2.0.25/Makefile.am --- old/acpid-2.0.23/Makefile.am 2012-02-17 04:37:12.000000000 +0100 +++ new/acpid-2.0.25/Makefile.am 2015-08-16 22:21:08.000000000 +0200 @@ -14,7 +14,7 @@ acpid_SOURCES = acpid.c acpi_ids.c connection_list.c event.c input_layer.c inotify_handler.c libnetlink.c log.c netlink.c proc.c sock.c ud_socket.c \ acpid.h acpi_genetlink.h acpi_ids.h config.h connection_list.h event.h genetlink.h inotify_handler.h input_layer.h \ - libnetlink.h log.h netlink.h proc.h sock.h ud_socket.h + libnetlink.h log.h netlink.h proc.h sock.h ud_socket.h libc_compat.h acpi_listen_SOURCES = acpi_listen.c log.c ud_socket.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/Makefile.in new/acpid-2.0.25/Makefile.in --- old/acpid-2.0.23/Makefile.in 2014-08-23 19:53:10.000000000 +0200 +++ new/acpid-2.0.25/Makefile.in 2015-08-17 01:08:59.000000000 +0200 @@ -370,7 +370,7 @@ AM_CPPFLAGS = -include $(top_srcdir)/config.h acpid_SOURCES = acpid.c acpi_ids.c connection_list.c event.c input_layer.c inotify_handler.c libnetlink.c log.c netlink.c proc.c sock.c ud_socket.c \ acpid.h acpi_genetlink.h acpi_ids.h config.h connection_list.h event.h genetlink.h inotify_handler.h input_layer.h \ - libnetlink.h log.h netlink.h proc.h sock.h ud_socket.h + libnetlink.h log.h netlink.h proc.h sock.h ud_socket.h libc_compat.h acpi_listen_SOURCES = acpi_listen.c log.c ud_socket.c dist_man8_MANS = acpid.8 acpi_listen.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/README new/acpid-2.0.25/README --- old/acpid-2.0.23/README 2014-08-23 19:51:30.000000000 +0200 +++ new/acpid-2.0.25/README 2015-08-16 22:18:22.000000000 +0200 @@ -17,9 +17,9 @@ acpid. You'll want to kill it before installing the new version. While "sudo killall acpid" might work, it is likely that you'll need to work with init (e.g. upstart, systemd, ...) on your particular setup to stop acpid -completely. For example, with upstart, the proper incantation is usually: +completely. For example, with systemd, the proper incantation is usually: - $ sudo initctl stop acpid + $ sudo systemctl stop acpid acpid.socket acpid version 2.0.15 introduced autoconf. To build versions >= 2.0.15: @@ -46,52 +46,6 @@ You can also fork the git repo on sourceforge and submit changes that way: http://sourceforge.net/u/tedfelix/acpid2/ -RELEASE PROCESS - -Before making the tarball: - - 1. Check the version number in configure.ac and the Changelog. - 2. Check in all changes (except maybe the Changelog). - 3. Update the Changelog based on changes since the last tag. - git log 2.0.17.. - 4. Check in Changelog and create a tag for the version. - git commit -a - git tag -a 2.0.xx - 5. Push to sf. - git push - git push --tags - -To create the tarball for distribution: - - $ make distclean - $ autoreconf --install --force - $ ./configure - $ make dist - -Upload to sf: - - http://sourceforge.net/apps/trac/sourceforge/wiki/Release%20files%20for%20do... - - $ rsync -t acpid-2.0.18.tar.xz tedfelix@frs.sourceforge.net:/home/frs/project/acpid2 - - or via sftp... - - $ sftp tedfelix@frs.sourceforge.net - sftp> cd /home/frs/project/acpid2 - sftp> put -p acpid-2.0.18.tar.xz - -Set this latest upload as the latest: - - 1. Login to sf. - 2. Click on the "i" icon on the right in the file list. - 3. Default download for: "Select all" - 4. Save - -Once complete: - - 1. Update the version number in configure.ac. - 2. Update the Changelog for the next version. - -------------------------------------------------------------------- OLD README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/TESTPLAN new/acpid-2.0.25/TESTPLAN --- old/acpid-2.0.23/TESTPLAN 2012-02-17 18:12:03.000000000 +0100 +++ new/acpid-2.0.25/TESTPLAN 2015-07-29 01:20:13.000000000 +0200 @@ -3,6 +3,7 @@ Suggestions - Run all these tests with valgrind to detect memory leaks. + - It's best to test without a window manager running (such as GNOME or KDE) as they tend to handle acpi events on their own and override acpid. To bring down X on a system that is configured with a graphical login, there's usually @@ -13,14 +14,16 @@ It's different if you are using upstart: sudo initctl stop gdm And systemd requires a different incantation: - [anyone care to enlighten me?] + sudo systemctl stop gdm LightDM in Ubuntu 11.10 (and others) doesn't seem to care about the power button. So no need to stop it. Just log out. Now X is out of the way and you can test from the console. + - You can kill acpid with "sudo killall acpid". Or if you are using upstart: sudo initctl stop acpid For systemd: - [anyone?] + sudo systemctl stop acpid acpid.socket + - To make testing more convenient, you can run acpid from a shell as "acpid -ld" to get maximum logging. Use Ctrl-C to stop acpid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/aclocal.m4 new/acpid-2.0.25/aclocal.m4 --- old/acpid-2.0.23/aclocal.m4 2014-08-23 19:53:08.000000000 +0200 +++ new/acpid-2.0.25/aclocal.m4 2015-08-17 01:08:57.000000000 +0200 @@ -573,7 +573,8 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/acpi_listen.c new/acpid-2.0.25/acpi_listen.c --- old/acpid-2.0.23/acpi_listen.c 2012-03-04 14:50:41.000000000 +0100 +++ new/acpid-2.0.25/acpi_listen.c 2015-07-29 00:32:35.000000000 +0200 @@ -32,13 +32,15 @@ #include <ctype.h> #include <getopt.h> #include <time.h> -#include <sys/poll.h> +#include <poll.h> #include <grp.h> #include <signal.h> #include "acpid.h" #include "ud_socket.h" +#include "libc_compat.h" + static int handle_cmdline(int *argc, char ***argv); static char *read_line(int fd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/acpid.c new/acpid-2.0.25/acpid.c --- old/acpid-2.0.23/acpid.c 2014-02-26 01:45:41.000000000 +0100 +++ new/acpid-2.0.25/acpid.c 2015-07-29 00:32:35.000000000 +0200 @@ -41,6 +41,7 @@ #include "input_layer.h" #include "inotify_handler.h" #include "netlink.h" +#include "libc_compat.h" static int handle_cmdline(int *argc, char ***argv); static void close_fds(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/build-aux/config.guess new/acpid-2.0.25/build-aux/config.guess --- old/acpid-2.0.23/build-aux/config.guess 2014-08-23 19:53:10.000000000 +0200 +++ new/acpid-2.0.25/build-aux/config.guess 2015-08-17 01:08:59.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <<EOF $0: unable to guess system type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/build-aux/config.sub new/acpid-2.0.25/build-aux/config.sub --- old/acpid-2.0.23/build-aux/config.sub 2014-08-23 19:53:10.000000000 +0200 +++ new/acpid-2.0.25/build-aux/config.sub 2015-08-17 01:08:59.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2014-09-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -265,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,11 +298,11 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -324,7 +327,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -381,6 +384,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +404,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +419,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -822,6 +829,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1367,14 +1378,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1592,9 +1603,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/config.h new/acpid-2.0.25/config.h --- old/acpid-2.0.23/config.h 2014-08-23 19:53:21.000000000 +0200 +++ new/acpid-2.0.25/config.h 2015-08-17 01:09:08.000000000 +0200 @@ -133,7 +133,7 @@ #define PACKAGE_NAME "acpid" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "acpid 2.0.23" +#define PACKAGE_STRING "acpid 2.0.25" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "acpid" @@ -142,7 +142,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.23" +#define PACKAGE_VERSION "2.0.25" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -170,7 +170,7 @@ /* Version number of package */ -#define VERSION "2.0.23" +#define VERSION "2.0.25" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/configure new/acpid-2.0.25/configure --- old/acpid-2.0.23/configure 2014-08-23 19:53:09.000000000 +0200 +++ new/acpid-2.0.25/configure 2015-08-17 01:08:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for acpid 2.0.23. +# Generated by GNU Autoconf 2.69 for acpid 2.0.25. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='acpid' PACKAGE_TARNAME='acpid' -PACKAGE_VERSION='2.0.23' -PACKAGE_STRING='acpid 2.0.23' +PACKAGE_VERSION='2.0.25' +PACKAGE_STRING='acpid 2.0.25' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1276,7 +1276,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures acpid 2.0.23 to adapt to many kinds of systems. +\`configure' configures acpid 2.0.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of acpid 2.0.23:";; + short | recursive ) echo "Configuration of acpid 2.0.25:";; esac cat <<\_ACEOF @@ -1441,7 +1441,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -acpid configure 2.0.23 +acpid configure 2.0.25 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1860,7 +1860,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by acpid $as_me 2.0.23, which was +It was created by acpid $as_me 2.0.25, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2726,7 +2726,7 @@ # Define the identity of the package. PACKAGE='acpid' - VERSION='2.0.23' + VERSION='2.0.25' cat >>confdefs.h <<_ACEOF @@ -2903,6 +2903,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -6180,7 +6181,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by acpid $as_me 2.0.23, which was +This file was extended by acpid $as_me 2.0.25, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6246,7 +6247,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -acpid config.status 2.0.23 +acpid config.status 2.0.25 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/configure.ac new/acpid-2.0.25/configure.ac --- old/acpid-2.0.23/configure.ac 2014-03-15 19:02:20.000000000 +0100 +++ new/acpid-2.0.25/configure.ac 2015-08-16 01:11:22.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([acpid], [2.0.23]) +AC_INIT([acpid], [2.0.25]) AC_CONFIG_SRCDIR([connection_list.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/event.c new/acpid-2.0.25/event.c --- old/acpid-2.0.23/event.c 2013-12-19 03:42:46.000000000 +0100 +++ new/acpid-2.0.25/event.c 2015-07-29 00:32:35.000000000 +0200 @@ -23,7 +23,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/wait.h> -#include <sys/poll.h> +#include <poll.h> #include <fcntl.h> #include <unistd.h> #include <stdio.h> @@ -39,6 +39,8 @@ #include "log.h" #include "sock.h" #include "ud_socket.h" +#include "libc_compat.h" + #include "event.h" /* * What is a rule? It's polymorphic, pretty much. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/input_layer.c new/acpid-2.0.25/input_layer.c --- old/acpid-2.0.23/input_layer.c 2014-04-30 02:13:36.000000000 +0200 +++ new/acpid-2.0.25/input_layer.c 2015-07-29 00:32:35.000000000 +0200 @@ -42,6 +42,7 @@ #include "log.h" #include "connection_list.h" #include "event.h" +#include "libc_compat.h" #include "input_layer.h" @@ -147,10 +148,12 @@ "jack/lineout LINEOUT unplug"}, {{{0,0}, EV_SW, SW_LINEOUT_INSERT, 1}, "jack/lineout LINEOUT plug"}, +#ifdef SW_VIDEOOUT_INSERT {{{0,0}, EV_SW, SW_VIDEOOUT_INSERT, 0}, "jack/videoout VIDEOOUT unplug"}, {{{0,0}, EV_SW, SW_VIDEOOUT_INSERT, 1}, "jack/videoout VIDEOOUT plug"}, +#endif {{{0,0}, EV_SW, SW_LINEIN_INSERT, 0}, "jack/linein LINEIN unplug"}, {{{0,0}, EV_SW, SW_LINEIN_INSERT, 1}, @@ -184,6 +187,8 @@ {{{0,0}, EV_KEY, KEY_F24, 1}, "button/f24 F24 00000080 00000000"}, {{{0,0}, EV_KEY, KEY_KBDILLUMTOGGLE, 1}, "button/kbdillumtoggle KBILLUM 00000080 00000000"}, + {{{0,0}, EV_KEY, KEY_COPY, 1}, "button/copy COPY 00000080 00000000"}, + {{{0,0}, EV_KEY, KEY_RESTART, 1}, "button/restart RSTR 00000080 00000000"}, #if 0 /* These "EV_MSC, 4, x" events cause trouble. They are triggered */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/kacpimon/Makefile.am new/acpid-2.0.25/kacpimon/Makefile.am --- old/acpid-2.0.23/kacpimon/Makefile.am 2012-02-17 04:43:50.000000000 +0100 +++ new/acpid-2.0.25/kacpimon/Makefile.am 2015-08-16 22:27:15.000000000 +0200 @@ -2,7 +2,8 @@ AM_CFLAGS = -Wall -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes -Wformat=2 sbin_PROGRAMS = kacpimon kacpimon_SOURCES = acpi_ids.c kacpimon.c connection_list.c input_layer.c libnetlink.c netlink.c \ - acpi_genetlink.h acpi_ids.h connection_list.h genetlink.h input_layer.h kacpimon.h libnetlink.h netlink.h + acpi_genetlink.h acpi_ids.h connection_list.h genetlink.h input_layer.h kacpimon.h libnetlink.h netlink.h \ + libc_compat.h dist_man8_MANS = kacpimon.8 EXTRA_DIST = sample.out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/kacpimon/Makefile.in new/acpid-2.0.25/kacpimon/Makefile.in --- old/acpid-2.0.23/kacpimon/Makefile.in 2014-08-23 19:53:10.000000000 +0200 +++ new/acpid-2.0.25/kacpimon/Makefile.in 2015-08-17 01:08:59.000000000 +0200 @@ -281,7 +281,8 @@ AM_CPPFLAGS = -include $(top_srcdir)/config.h AM_CFLAGS = -Wall -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes -Wformat=2 kacpimon_SOURCES = acpi_ids.c kacpimon.c connection_list.c input_layer.c libnetlink.c netlink.c \ - acpi_genetlink.h acpi_ids.h connection_list.h genetlink.h input_layer.h kacpimon.h libnetlink.h netlink.h + acpi_genetlink.h acpi_ids.h connection_list.h genetlink.h input_layer.h kacpimon.h libnetlink.h netlink.h \ + libc_compat.h dist_man8_MANS = kacpimon.8 EXTRA_DIST = sample.out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/kacpimon/libc_compat.h new/acpid-2.0.25/kacpimon/libc_compat.h --- old/acpid-2.0.23/kacpimon/libc_compat.h 1970-01-01 01:00:00.000000000 +0100 +++ new/acpid-2.0.25/kacpimon/libc_compat.h 2015-08-16 22:30:27.000000000 +0200 @@ -0,0 +1,40 @@ +/* + * libc_compat.h - implement defs/macros missing from some libcs + * + * Copyright (C) 1999-2000 Andrew Henroid + * Copyright (C) 2001 Sun Microsystems + * Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef LIBC_COMPAT_H__ +#define LIBC_COMPAT_H__ + +/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno' + set to EINTR. This macro is present on glibc/uclibc but may not be in other cases. */ + +#ifndef ____GLIBC__ +#ifndef TEMP_FAILURE_RETRY +#define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ + ({ long int __result; \ + do __result = (long int) (expression); \ + while (__result == -1L && errno == EINTR); \ + __result; })) +#endif +#endif /* __GLIBC__ */ + +#endif /* LIBC_COMPAT_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/kacpimon/libnetlink.h new/acpid-2.0.25/kacpimon/libnetlink.h --- old/acpid-2.0.23/kacpimon/libnetlink.h 2008-11-09 22:19:54.000000000 +0100 +++ new/acpid-2.0.25/kacpimon/libnetlink.h 2015-07-29 00:32:35.000000000 +0200 @@ -7,6 +7,8 @@ #include <linux/netlink.h> #include <linux/rtnetlink.h> +#include "libc_compat.h" + struct rtnl_handle { int fd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/libc_compat.h new/acpid-2.0.25/libc_compat.h --- old/acpid-2.0.23/libc_compat.h 1970-01-01 01:00:00.000000000 +0100 +++ new/acpid-2.0.25/libc_compat.h 2015-07-29 00:32:35.000000000 +0200 @@ -0,0 +1,40 @@ +/* + * libc_compat.h - implement defs/macros missing from some libcs + * + * Copyright (C) 1999-2000 Andrew Henroid + * Copyright (C) 2001 Sun Microsystems + * Portions Copyright (C) 2004 Tim Hockin (thockin@hockin.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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef LIBC_COMPAT_H__ +#define LIBC_COMPAT_H__ + +/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno' + set to EINTR. This macro is present on glibc/uclibc but may not be in other cases. */ + +#ifndef ____GLIBC__ +#ifndef TEMP_FAILURE_RETRY +#define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ + ({ long int __result; \ + do __result = (long int) (expression); \ + while (__result == -1L && errno == EINTR); \ + __result; })) +#endif +#endif /* __GLIBC__ */ + +#endif /* LIBC_COMPAT_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/libnetlink.c new/acpid-2.0.25/libnetlink.c --- old/acpid-2.0.23/libnetlink.c 2012-07-15 00:29:38.000000000 +0200 +++ new/acpid-2.0.25/libnetlink.c 2015-07-29 00:32:35.000000000 +0200 @@ -24,6 +24,8 @@ #include <time.h> #include <sys/uio.h> +#include "libc_compat.h" + #include "libnetlink.h" void rtnl_close(struct rtnl_handle *rth) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/netlink.c new/acpid-2.0.25/netlink.c --- old/acpid-2.0.23/netlink.c 2013-08-15 02:01:22.000000000 +0200 +++ new/acpid-2.0.25/netlink.c 2015-07-29 00:32:35.000000000 +0200 @@ -41,6 +41,7 @@ #include "libnetlink.h" #include "genetlink.h" #include "acpi_genetlink.h" +#include "libc_compat.h" #include "acpi_ids.h" #include "connection_list.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/proc.c new/acpid-2.0.25/proc.c --- old/acpid-2.0.23/proc.c 2013-08-15 01:59:20.000000000 +0200 +++ new/acpid-2.0.25/proc.c 2015-07-29 00:32:35.000000000 +0200 @@ -31,6 +31,7 @@ #include "log.h" #include "event.h" #include "connection_list.h" +#include "libc_compat.h" #include "proc.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/sock.c new/acpid-2.0.25/sock.c --- old/acpid-2.0.23/sock.c 2013-08-15 01:30:44.000000000 +0200 +++ new/acpid-2.0.25/sock.c 2015-07-29 00:32:35.000000000 +0200 @@ -30,6 +30,7 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <errno.h> #include <grp.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.23/ud_socket.c new/acpid-2.0.25/ud_socket.c --- old/acpid-2.0.23/ud_socket.c 2012-07-15 00:32:55.000000000 +0200 +++ new/acpid-2.0.25/ud_socket.c 2015-07-29 00:32:35.000000000 +0200 @@ -21,6 +21,7 @@ #include "acpid.h" #include "log.h" #include "ud_socket.h" +#include "libc_compat.h" int ud_create_socket(const char *name, mode_t socketmode) ++++++ acpid-makefile.patch ++++++ --- /var/tmp/diff_new_pack.yBN8nS/_old 2015-09-30 05:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.yBN8nS/_new 2015-09-30 05:52:25.000000000 +0200 @@ -1,6 +1,8 @@ ---- Makefile.in.orig 2012-03-16 09:34:42.474574907 -0400 -+++ Makefile.in 2012-03-16 09:34:59.373363642 -0400 -@@ -890,7 +890,7 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig ++++ Makefile.in +@@ -980,7 +980,7 @@ info: info-recursive info-am: