Accepting request 109919 from Base:System
update to 2.0.15 (forwarded request 109840 from tabraham1) OBS-URL: https://build.opensuse.org/request/show/109919 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=56
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
3fae2ffe32
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:88158b889280017072362b37a4b378826285756489857b93fc5888acf5b4db0b
|
||||
size 77395
|
||||
3
acpid-2.0.15.tar.gz
Normal file
3
acpid-2.0.15.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcb1402779c92a238dabe7dbd524fe759d74c9a7d6fbb552162b1f1b59fbf74f
|
||||
size 204529
|
||||
@ -1,13 +1,11 @@
|
||||
Index: Makefile
|
||||
===================================================================
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -49,7 +49,7 @@ install_docs:
|
||||
for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done
|
||||
cp -a samples $(DESTDIR)/$(DOCDIR)
|
||||
--- 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 @@
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-dist_docDATA install-man
|
||||
+install-data-am: install-man
|
||||
|
||||
install-dvi: install-dvi-recursive
|
||||
|
||||
-install: $(PROGS) man install_docs
|
||||
+install: $(PROGS) man
|
||||
mkdir -p $(DESTDIR)/$(SBINDIR)
|
||||
mkdir -p $(DESTDIR)/$(BINDIR)
|
||||
install -m 0750 acpid $(DESTDIR)/$(SBINDIR)
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
Index: acpid-2.0.13/libnetlink.c
|
||||
===================================================================
|
||||
--- acpid-2.0.13.orig/libnetlink.c
|
||||
+++ acpid-2.0.13/libnetlink.c
|
||||
@@ -41,7 +41,7 @@ int rtnl_open_byproto(struct rtnl_handle
|
||||
--- libnetlink.c.orig 2012-03-16 09:03:33.422941268 -0400
|
||||
+++ libnetlink.c 2012-03-16 09:03:52.113707601 -0400
|
||||
@@ -41,7 +41,7 @@
|
||||
int sndbuf = 32768;
|
||||
int rcvbuf = 32768;
|
||||
|
||||
- memset(rth, 0, sizeof(rth));
|
||||
+ memset(rth, 0, sizeof(*rth));
|
||||
|
||||
rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
|
||||
rth->fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, protocol);
|
||||
if (rth->fd < 0) {
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 16 12:49:12 UTC 2012 - tabraham@novell.com
|
||||
|
||||
- Update to acpid 2.0.15
|
||||
+ Improve man page (Debian bug #656676)
|
||||
(acpid.8 acpi_listen.8) (Ted Felix)
|
||||
+ Change makefile to get rid of double slashes on install paths.
|
||||
Note: This change was lost due to introduction of autoconf which
|
||||
wiped out the old Makefile. (Makefile) (Gilles Espinasse)
|
||||
+ Switch from Makefile to autoconf build system. Fix some related
|
||||
warnings.
|
||||
(Makefile Makefile.am README TODO acpi_ids.c acpi_ids.h acpid.h
|
||||
configure.ac connection_list.h event.c kacpimon/Makefile.am
|
||||
kacpimon/makefile proc.h sock.h)
|
||||
(Cristian Rodriguez)
|
||||
+ Fix build warnings uncovered by new gcc settings from autoconf.
|
||||
(inotify_handler.c input_layer.c kacpimon/acpi_ids.c kacpimon/acpi_ids.h
|
||||
kacpimon/connection_list.c kacpimon/connection_list.h
|
||||
kacpimon/input_layer.c kacpimon/kacpimon.c kacpimon/netlink.c netlink.c
|
||||
proc.c sock.c)
|
||||
(Ted Felix)
|
||||
+ Remove fcntl() calls to set FD_CLOEXEC and replace with
|
||||
CLOEXEC flags within the various open(), recvmsg() and other calls.
|
||||
Requires kernel version 2.6.23 and above.
|
||||
(acpi_listen.c inotify_handler.c input_layer.c libnetlink.c netlink.c
|
||||
proc.c ud_socket.c)
|
||||
(Cristian Rodriguez)
|
||||
+ Add SOCK_NONBLOCK to ud_create_socket().
|
||||
(ud_socket.c) (Cristian Rodriguez)
|
||||
+ Use isfdtype() instead of getsockopt() in is_socket(). Use fchmod(),
|
||||
fstat(), and fchown() instead of the non-"f" versions in open_sock().
|
||||
(sock.c) (Cristian Rodriguez)
|
||||
+ Use __attribute__ for argument checking in acpid_log().
|
||||
(input_layer.c log.h netlink.c ud_socket.c) (Cristian Rodriguez)
|
||||
+ Close only the open fds in close_fds().
|
||||
(acpid.c) (Cristian Rodriguez)
|
||||
+ Use accept4() with SOCK_CLOEXEC and SOCK_NONBLOCK in ud_accept().
|
||||
Remove unnecessary calls to fcntl() in process_sock().
|
||||
(sock.c ud_socket.c) (Cristian Rodriguez)
|
||||
+ Use asprintf() instead of snprintf() in process_sock().
|
||||
(sock.c) (Cristian Rodriguez)
|
||||
+ Use TEMP_FAILURE_RETRY macro instead of bogus checks for EINTR.
|
||||
(acpi_listen.c acpid.c event.c input_layer.c libnetlink.c netlink.c
|
||||
proc.c ud_socket.c) (Cristian Rodriguez)
|
||||
+ Use safer, faster, and more modern functions asprintf(), fstatat(),
|
||||
openat(), and fdopen() in the configuration file processing.
|
||||
(event.c) (Cristian Rodriguez)
|
||||
|
||||
- refreshed patches - acpid-makefile.patch acpid-wrong-memset.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 17 23:43:46 UTC 2012 - tabraham@novell.com
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: acpid
|
||||
Version: 2.0.14
|
||||
Version: 2.0.15
|
||||
Release: 0
|
||||
License: GPL-2.0+
|
||||
Summary: Executes Actions at ACPI Events
|
||||
@ -55,12 +55,13 @@ Configure it in /etc/sysconfig/powermanagement.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch2
|
||||
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE9} .
|
||||
|
||||
%build
|
||||
export LDFLAGS="-Wl,-z,relro,-z,now"
|
||||
%configure
|
||||
make OPT="%{optflags}" %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -111,10 +112,12 @@ touch %{buildroot}%{_localstatedir}/log/acpid
|
||||
%_unitdir/%{name}.service
|
||||
%{_sbindir}/rcacpid
|
||||
%{_sbindir}/acpid
|
||||
%{_sbindir}/kacpimon
|
||||
%{_bindir}/acpi_listen
|
||||
%doc README.SuSE README Changelog examples
|
||||
%{_mandir}/man8/acpid.8.gz
|
||||
%{_mandir}/man8/acpi_listen.8.gz
|
||||
%{_mandir}/man8/kacpimon.8.gz
|
||||
%ghost %config(noreplace,missingok) %{_localstatedir}/log/acpid
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user