Hello community, here is the log from the commit of package acpid for openSUSE:Factory checked in at 2013-12-13 13:01:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-11-22 06:53:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.acpid.new/acpid.changes 2013-12-13 13:01:37.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Dec 12 14:49:57 UTC 2013 - [email protected] + +- Update to version 2.0.20 + - Improve build and release documentation. + (README) (Ted Felix) + - Fix for Debian bug #719659. Improved handling of systems with + large numbers of input layer connections. Better error handling. + (connection_list.h connection_list.c inotify_handler.c input_layer.c + netlink.c proc.c sock.c acpid.c) (Ted Felix, Ben Winslow) + - Update .gitignore for Eclipse. + (.gitignore) (Ted Felix) +- Remove unused rcacpid from sources +- Change systemd for systemd-rpm-macros requirement; full systemd + environment is not needed to build +- Rename README.SuSE in README.SUSE to fix suse-wrong-suse-capitalisation + rpmlint warning + +------------------------------------------------------------------- Old: ---- README.SuSE acpid-2.0.19.tar.xz rcacpid New: ---- README.SUSE acpid-2.0.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.91YyIT/_old 2013-12-13 13:01:38.000000000 +0100 +++ /var/tmp/diff_new_pack.91YyIT/_new 2013-12-13 13:01:38.000000000 +0100 @@ -17,14 +17,14 @@ Name: acpid -Version: 2.0.19 +Version: 2.0.20 Release: 0 Summary: Executes Actions at ACPI Events License: GPL-2.0+ Group: System/Daemons Url: http://tedfelix.com/linux/acpid-netlink.html Source: http://downloads.sourceforge.net/project/acpid2/%{name}-%{version}.tar.xz -Source3: README.SuSE +Source3: README.SUSE Source5: events.power_button Source6: thinkpad_handler Source7: power_button @@ -35,7 +35,7 @@ # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: acpid-makefile.patch -BuildRequires: systemd +BuildRequires: systemd-rpm-macros BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 @@ -99,7 +99,7 @@ %{_sbindir}/acpid %{_sbindir}/kacpimon %{_bindir}/acpi_listen -%doc README.SuSE README Changelog examples +%doc README.SUSE README Changelog examples %{_mandir}/man8/acpid.8.gz %{_mandir}/man8/acpi_listen.8.gz %{_mandir}/man8/kacpimon.8.gz ++++++ README.SUSE ++++++ Dokumentation for acpid can be found in 'man acpid'. Be aware that the acpid is only used to hand over ACPI events (caught from /proc/acpi/events) to other services (e.g. hal, powersaved, iald, ...). The events are handled by those services. Most of them are processed by the powersave daemon. For further documentation, please have a look at: /usr/share/doc/packages/powersave/ or http://powersave.sourceforge.net/ ++++++ acpid-2.0.19.tar.xz -> acpid-2.0.20.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/Changelog new/acpid-2.0.20/Changelog --- old/acpid-2.0.19/Changelog 2013-05-28 14:48:24.000000000 +0200 +++ new/acpid-2.0.20/Changelog 2013-09-15 14:55:01.000000000 +0200 @@ -1,3 +1,15 @@ +* Sun Sep 15 2013 Ted Felix <ted -at- tedfelix -dot- com> + - 2.0.20 release + (configure.ac) (Ted Felix) + - Improve build and release documentation. + (README) (Ted Felix) + - Fix for Debian bug #719659. Improved handling of systems with + large numbers of input layer connections. Better error handling. + (connection_list.h connection_list.c inotify_handler.c input_layer.c + netlink.c proc.c sock.c acpid.c) (Ted Felix, Ben Winslow) + - Update .gitignore for Eclipse. + (.gitignore) (Ted Felix) + * Tue May 28 2013 Ted Felix <ted -at- tedfelix -dot- com> - 2.0.19 release (configure.ac) (Ted Felix) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/README new/acpid-2.0.20/README --- old/acpid-2.0.19/README 2013-02-15 15:06:54.000000000 +0100 +++ new/acpid-2.0.20/README 2013-08-15 01:16:17.000000000 +0200 @@ -23,7 +23,7 @@ acpid version 2.0.15 introduced autoconf. To build versions >= 2.0.15: - $ ./configure + $ ./configure --prefix=/usr $ make $ sudo make install @@ -80,6 +80,13 @@ 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/acpid.c new/acpid-2.0.20/acpid.c --- old/acpid-2.0.19/acpid.c 2012-09-04 00:14:24.000000000 +0200 +++ new/acpid-2.0.20/acpid.c 2013-08-15 22:12:51.000000000 +0200 @@ -456,6 +456,7 @@ clean_exit_with_status(int status) { acpid_cleanup_rules(1); + delete_all_connections(); acpid_log(LOG_NOTICE, "exiting"); unlink(pidfile); exit(status); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/config.h new/acpid-2.0.20/config.h --- old/acpid-2.0.19/config.h 2013-05-28 14:50:55.000000000 +0200 +++ new/acpid-2.0.20/config.h 2013-09-15 14:59:26.000000000 +0200 @@ -136,7 +136,7 @@ #define PACKAGE_NAME "acpid" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "acpid 2.0.19" +#define PACKAGE_STRING "acpid 2.0.20" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "acpid" @@ -145,7 +145,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.19" +#define PACKAGE_VERSION "2.0.20" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -173,7 +173,7 @@ /* Version number of package */ -#define VERSION "2.0.19" +#define VERSION "2.0.20" /* 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.19/configure new/acpid-2.0.20/configure --- old/acpid-2.0.19/configure 2013-05-28 14:50:38.000000000 +0200 +++ new/acpid-2.0.20/configure 2013-09-15 14:58:55.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.19. +# Generated by GNU Autoconf 2.69 for acpid 2.0.20. # # # 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.19' -PACKAGE_STRING='acpid 2.0.19' +PACKAGE_VERSION='2.0.20' +PACKAGE_STRING='acpid 2.0.20' 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.19 to adapt to many kinds of systems. +\`configure' configures acpid 2.0.20 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.19:";; + short | recursive ) echo "Configuration of acpid 2.0.20:";; esac cat <<\_ACEOF @@ -1438,7 +1438,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -acpid configure 2.0.19 +acpid configure 2.0.20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1857,7 +1857,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.19, which was +It was created by acpid $as_me 2.0.20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2675,7 +2675,7 @@ # Define the identity of the package. PACKAGE='acpid' - VERSION='2.0.19' + VERSION='2.0.20' cat >>confdefs.h <<_ACEOF @@ -6131,7 +6131,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.19, which was +This file was extended by acpid $as_me 2.0.20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6197,7 +6197,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.19 +acpid config.status 2.0.20 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.19/configure.ac new/acpid-2.0.20/configure.ac --- old/acpid-2.0.19/configure.ac 2013-02-15 14:41:33.000000000 +0100 +++ new/acpid-2.0.20/configure.ac 2013-05-28 14:56:03.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.19]) +AC_INIT([acpid], [2.0.20]) 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.19/connection_list.c new/acpid-2.0.20/connection_list.c --- old/acpid-2.0.19/connection_list.c 2011-12-03 04:29:00.000000000 +0100 +++ new/acpid-2.0.20/connection_list.c 2013-08-16 00:49:18.000000000 +0200 @@ -35,9 +35,9 @@ /*---------------------------------------------------------------*/ /* private objects */ -#define MAX_CONNECTIONS 20 +static int capacity = 0; -static struct connection connection_list[MAX_CONNECTIONS]; +static struct connection *connection_list = NULL; static int nconnections = 0; @@ -51,16 +51,24 @@ /*---------------------------------------------------------------*/ /* public functions */ -void +int add_connection(struct connection *p) { if (nconnections < 0) - return; - if (nconnections >= MAX_CONNECTIONS) { - acpid_log(LOG_ERR, "Too many connections."); - /* ??? This routine should return -1 in this situation so that */ - /* callers can clean up any open fds and whatnot. */ - return; + return -1; + + /* if the list is full, allocate more space */ + if (nconnections >= capacity) { + /* no more than 1024 */ + if (capacity > 1024) { + acpid_log(LOG_ERR, "Too many connections."); + return -1; + } + + /* another 20 */ + capacity += 20; + connection_list = + realloc(connection_list, sizeof(struct connection) * capacity); } if (nconnections == 0) @@ -73,6 +81,8 @@ /* add to the fd set */ FD_SET(p->fd, &allfds); highestfd = max(highestfd, p->fd); + + return 0; } /*---------------------------------------------------------------*/ @@ -82,7 +92,9 @@ { int i; - close(fd); + /* close anything other than stdin/stdout/stderr */ + if (fd > 2) + close(fd); /* remove from the fd set */ FD_CLR(fd, &allfds); @@ -109,6 +121,21 @@ } /*---------------------------------------------------------------*/ + +void +delete_all_connections(void) +{ + /* while there are still connections to delete */ + while (nconnections) { + /* delete the connection at the end of the list */ + delete_connection(connection_list[nconnections-1].fd); + } + + free(connection_list); + connection_list = NULL; +} + +/*---------------------------------------------------------------*/ struct connection * find_connection(int fd) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/connection_list.h new/acpid-2.0.20/connection_list.h --- old/acpid-2.0.19/connection_list.h 2012-02-16 21:24:53.000000000 +0100 +++ new/acpid-2.0.20/connection_list.h 2013-08-15 22:24:07.000000000 +0200 @@ -48,7 +48,7 @@ }; /* add a connection to the list */ -extern void add_connection(struct connection *p); +extern int add_connection(struct connection *p); /* delete a connection from the list */ extern void delete_connection(int fd); @@ -75,4 +75,7 @@ /* get the highest fd that was added to the list */ extern int get_highestfd(void); +/* delete all connections, closing the fds */ +extern void delete_all_connections(void); + #endif /* CONNECTION_LIST_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/inotify_handler.c new/acpid-2.0.20/inotify_handler.c --- old/acpid-2.0.19/inotify_handler.c 2012-02-19 15:46:57.000000000 +0100 +++ new/acpid-2.0.20/inotify_handler.c 2013-08-15 01:35:27.000000000 +0200 @@ -145,6 +145,11 @@ c.process = process_inotify; c.pathname = NULL; c.kybd = 0; - add_connection(&c); + + if (add_connection(&c) < 0) { + close(fd); + acpid_log(LOG_ERR, "can't add connection for inotify"); + return; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/input_layer.c new/acpid-2.0.20/input_layer.c --- old/acpid-2.0.19/input_layer.c 2013-04-24 21:06:09.000000000 +0200 +++ new/acpid-2.0.20/input_layer.c 2013-08-15 02:01:13.000000000 +0200 @@ -411,7 +411,14 @@ strcpy(c.pathname, filename); /* assume not a keyboard until we see a scancode */ c.kybd = 0; - add_connection(&c); + + if (add_connection(&c) < 0) { + close(fd); + acpid_log(LOG_ERR, + "can't add connection for input layer %s (%s)", + filename, evname); + return -1; + } return 0; /* success */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/netlink.c new/acpid-2.0.20/netlink.c --- old/acpid-2.0.19/netlink.c 2012-03-04 14:50:41.000000000 +0100 +++ new/acpid-2.0.20/netlink.c 2013-08-15 02:01:22.000000000 +0200 @@ -233,6 +233,12 @@ c.process = process_netlink; c.pathname = NULL; c.kybd = 0; - add_connection(&c); + + if (add_connection(&c) < 0) { + rtnl_close(&rth); + acpid_log(LOG_ERR, + "can't add connection for generic netlink socket"); + return; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/proc.c new/acpid-2.0.20/proc.c --- old/acpid-2.0.19/proc.c 2012-03-04 14:50:41.000000000 +0100 +++ new/acpid-2.0.20/proc.c 2013-08-15 01:59:20.000000000 +0200 @@ -109,7 +109,12 @@ c.process = process_proc; c.pathname = NULL; c.kybd = 0; - add_connection(&c); + + if (add_connection(&c) < 0) { + close(fd); + acpid_log(LOG_ERR, "can't add connection for %s", eventfile); + return -1; + } return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.19/sock.c new/acpid-2.0.20/sock.c --- old/acpid-2.0.19/sock.c 2012-03-21 00:58:11.000000000 +0100 +++ new/acpid-2.0.20/sock.c 2013-08-15 01:30:44.000000000 +0200 @@ -170,5 +170,11 @@ c.process = process_sock; c.pathname = NULL; c.kybd = 0; - add_connection(&c); + + if (add_connection(&c) < 0) { + close(fd); + acpid_log(LOG_ERR, "can't add connection for socket %s", + socketfile); + return; + } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
