Hello community, here is the log from the commit of package acpid for openSUSE:Factory checked in at Tue Dec 28 23:54:09 CET 2010. -------- --- acpid/acpid.changes 2010-11-19 17:34:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/acpid/acpid.changes 2010-12-22 04:41:24.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Dec 22 03:36:31 UTC 2010 - aj@suse.de + +- Update to 2.0.7: + * Reduced the startup logging and skipped processing of "." and ".." + in the config files directory + * Added CD-related buttons. + * Removed the "getppid() == 1" hack from daemonize(). + * Added FD_CLOEXEC to the input layer fd's. + Obsoletes patches acpid-2.0.5-forking.patch and + acpid-2.0.6-event-skip-messages.patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- acpid-2.0.5-forking.patch acpid-2.0.6-event-skip-messages.patch acpid-2.0.6.tar.gz New: ---- acpid-2.0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.QxJLUC/_old 2010-12-28 23:53:49.000000000 +0100 +++ /var/tmp/diff_new_pack.QxJLUC/_new 2010-12-28 23:53:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package acpid (Version 2.0.6) +# spec file for package acpid (Version 2.0.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: acpid Url: http://tedfelix.com/linux/acpid-netlink.html -Version: 2.0.6 -Release: 4 +Version: 2.0.7 +Release: 1 License: GPLv2+ Group: System/Daemons AutoReqProv: on @@ -37,8 +37,6 @@ Source7: power_button Source8: acpid.service Patch1: acpid-makefile.patch -Patch2: acpid-2.0.5-forking.patch -Patch3: acpid-2.0.6-event-skip-messages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 @@ -62,8 +60,6 @@ %prep %setup -q %patch1 -p0 -%patch2 -p1 -%patch3 cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} . %build ++++++ acpid-2.0.6.tar.gz -> acpid-2.0.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.6/Changelog new/acpid-2.0.7/Changelog --- old/acpid-2.0.6/Changelog 2010-06-15 15:08:55.000000000 +0200 +++ new/acpid-2.0.7/Changelog 2010-11-15 19:10:31.000000000 +0100 @@ -1,4 +1,23 @@ -* Tue June 15 2010 Ted Felix <http://www.tedfelix.com> +* Mon Nov 15 2010 Ted Felix <http://www.tedfelix.com> + - 2.0.7 release + - Reduced the startup logging and skipped processing of "." and ".." + in the config files directory. Debian #598198. (event.c proc.c) + (Ted Felix) + - Added CD-related buttons. Debian #600564. (input_layer.c) + (Stanislav Maslovski) + - Removed the "getppid() == 1" hack from daemonize(). + Red Hat #629740. "While forking is ugly in theory, this has the advantage + that it is clear that the acpid unix socket is properly installed before + systemd continues starting other units that want to be started after + acpid." - Lennart Poettering + For upstart, specify "expect fork" in your upstart .conf file for acpid. + For systemd, specify "Type=forking" in your systemd service file for + acpid. + (acpid.c) (Lennart Poettering) + - Added FD_CLOEXEC to the input layer fd's. Red Hat #648221. + (input_layer.c) (Daniel Walsh) + +* Tue Jun 15 2010 Ted Felix <http://www.tedfelix.com> - 2.0.6 release - Added getXconsole() to samples/powerbtn/powerbtn.sh to eliminate dependency on other parts of Debian. (samples/powerbtn/powerbtn.sh) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.6/Makefile new/acpid-2.0.7/Makefile --- old/acpid-2.0.6/Makefile 2010-05-25 03:00:37.000000000 +0200 +++ new/acpid-2.0.7/Makefile 2010-11-05 18:42:23.000000000 +0100 @@ -1,7 +1,7 @@ # Makefile for ACPI daemon # update these numbers for new releases -VERSION = 2.0.6 +VERSION = 2.0.7 OPT = -O2 @@ -69,6 +69,7 @@ make -C $(FULLTMP) clean make -C $(FULLTMP)/kacpimon clean rm -f $(FULLTMP)/cscope.out + rm -f $(FULLTMP)/*anjuta* find $(FULLTMP) -name '*~' | xargs rm -f # Get rid of previous dist rm -f $(FULLTMP)/$(DISTNAME).tar.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.6/TODO new/acpid-2.0.7/TODO --- old/acpid-2.0.6/TODO 2009-04-29 16:36:27.000000000 +0200 +++ new/acpid-2.0.7/TODO 2010-11-15 19:14:36.000000000 +0100 @@ -1,6 +1,15 @@ Future Enhancements ------------------- +systemd support + - Support receiving unix sockets from systemd. + - Make daemonize() do what's right for systemd. + - Can we auto-detect systemd? Maybe the presence of the environment vars + for the unix sockets? + +Look into using libnl for netlink + - Can this be done? + DBUS support Re-implement autoconf/automake support Re-add ancillary files needed for wider distribution diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.6/acpid.c new/acpid-2.0.7/acpid.c --- old/acpid-2.0.6/acpid.c 2010-03-28 15:54:23.000000000 +0200 +++ new/acpid-2.0.7/acpid.c 2010-11-09 22:55:28.000000000 +0100 @@ -332,9 +332,6 @@ { pid_t pid, sid; - /* already a daemon */ - if ( getppid() == 1 ) return 0; - /* fork off the parent process */ pid = fork(); if (pid < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.6/event.c new/acpid-2.0.7/event.c --- old/acpid-2.0.6/event.c 2010-03-28 16:00:04.000000000 +0200 +++ new/acpid-2.0.7/event.c 2010-09-28 00:26:48.000000000 +0200 @@ -122,6 +122,12 @@ len = strlen(dirent->d_name); + /* skip "." and ".." */ + if (strncmp(dirent->d_name, ".", sizeof(dirent->d_name)) == 0) + continue; + if (strncmp(dirent->d_name, "..", sizeof(dirent->d_name)) == 0) + continue; + /* skip any files that don't match the run-parts convention */ if (regexec(&preg, dirent->d_name, 0, NULL, 0) != 0) { acpid_log(LOG_INFO, "skipping conf file %s/%s\n", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.6/input_layer.c new/acpid-2.0.7/input_layer.c --- old/acpid-2.0.6/input_layer.c 2010-03-28 15:15:28.000000000 +0200 +++ new/acpid-2.0.7/input_layer.c 2010-11-05 18:05:08.000000000 +0100 @@ -115,6 +115,15 @@ "button/volumeup VOLUP 00000080 00000000"}, {{{0,0}, EV_KEY, KEY_MUTE, 1}, "button/mute MUTE 00000080 00000000"}, + /* cd play/pause buttons */ + {{{0,0}, EV_KEY, KEY_NEXTSONG, 1}, + "cd/next CDNEXT 00000080 00000000"}, + {{{0,0}, EV_KEY, KEY_PREVIOUSSONG, 1}, + "cd/prev CDPREV 00000080 00000000"}, + {{{0,0}, EV_KEY, KEY_PLAYPAUSE, 1}, + "cd/play CDPLAY 00000080 00000000"}, + {{{0,0}, EV_KEY, KEY_STOPCD, 1}, + "cd/stop CDSTOP 00000080 00000000"}, /* additional events divined from the kernel's video.c */ {{{0,0}, EV_KEY, KEY_VIDEO_NEXT, 1}, "video/next NEXT 00000083 00000000"}, @@ -137,6 +146,7 @@ unsigned i; /* for each entry in the event table */ + /* ??? is there a faster way? */ for (i = 0; i < DIM(evtab); ++i) { /* if this is a matching event, return its string */ @@ -292,6 +302,10 @@ fd = open(filename, O_RDONLY | O_NONBLOCK); + /* Make sure scripts we exec() (in event.c) don't get our file + descriptors. */ + fcntl(fd, F_SETFD, FD_CLOEXEC); + if (fd >= 0) { /* if this file doesn't have events we need, indicate failure */ if (!has_event(fd)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.6/proc.c new/acpid-2.0.7/proc.c --- old/acpid-2.0.6/proc.c 2010-03-28 16:02:42.000000000 +0200 +++ new/acpid-2.0.7/proc.c 2010-11-05 18:05:01.000000000 +0100 @@ -88,7 +88,7 @@ fd = open(eventfile, O_RDONLY); if (fd < 0) { if (errno == ENOENT) { - acpid_log(LOG_INFO, "Deprecated %s was not found. " + acpid_log(LOG_DEBUG, "Deprecated %s was not found. " "Trying netlink and the input layer...\n", eventfile); } else { acpid_log(LOG_ERR, "can't open %s: %s (%d)\n", eventfile, @@ -97,7 +97,10 @@ return -1; } - fcntl(fd, F_SETFD, FD_CLOEXEC); + + /* Make sure scripts we exec() (in event.c) don't get our file + descriptors. */ + fcntl(fd, F_SETFD, FD_CLOEXEC); acpid_log(LOG_DEBUG, "proc fs opened successfully\n"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org