From a069d38a89fc10a2b636d741994dfe3ebc3974a1d35a53fae6d1fb899116c18c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 28 Nov 2008 14:25:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdaemon?expand=0&rev=9 --- libdaemon-0.12-bnc449728.diff | 18 ++++++++++++ libdaemon.changes | 5 ++++ libdaemon.spec | 54 ++++++++++++++++++++++------------- 3 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 libdaemon-0.12-bnc449728.diff diff --git a/libdaemon-0.12-bnc449728.diff b/libdaemon-0.12-bnc449728.diff new file mode 100644 index 0000000..0839fa2 --- /dev/null +++ b/libdaemon-0.12-bnc449728.diff @@ -0,0 +1,18 @@ +Index: b/libdaemon/dpid.c +=================================================================== +--- a/libdaemon/dpid.c ++++ b/libdaemon/dpid.c +@@ -215,11 +215,12 @@ int daemon_pid_file_create(void) { + goto finish; + } + + snprintf(t, sizeof(t), "%lu\n", (unsigned long) getpid()); + +- if (write(fd, t, l = strlen(t)) != l) { ++ l = strlen(t); ++ if (write(fd, t, l) != l) { + int saved_errno = errno; + daemon_log(LOG_WARNING, "write(): %s", strerror(errno)); + unlink(fn); + errno = saved_errno; + goto finish; diff --git a/libdaemon.changes b/libdaemon.changes index 34c3680..f0fd153 100644 --- a/libdaemon.changes +++ b/libdaemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 27 15:36:41 CET 2008 - seife@suse.de + +- fix compiler warning (bnc#449728) + ------------------------------------------------------------------- Tue Dec 18 15:08:17 CET 2007 - seife@suse.de diff --git a/libdaemon.spec b/libdaemon.spec index 7df50b7..e918732 100644 --- a/libdaemon.spec +++ b/libdaemon.spec @@ -1,29 +1,39 @@ # # spec file for package libdaemon (Version 0.12) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: libdaemon BuildRequires: doxygen Url: http://0pointer.de/lennart/projects/libdaemon/ Version: 0.12 -Release: 28 +Release: 30 Summary: Lightweight C library That Eases the Writing of UNIX Daemons License: LGPL v2.1 or later Group: System/Libraries Source: %{name}-%{version}.tar.bz2 Patch0: libdaemon-0.10-testd-fix-FD_SET.diff Patch1: bnc-309132.patch +Patch2: libdaemon-0.12-bnc449728.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libdaemon0 +License: LGPL v2.1 or later Summary: Lightweight C library That Eases the Writing of UNIX Daemons Group: System/Libraries Provides: %{name} = %{version} @@ -58,6 +68,7 @@ Authors: Lennart Poettering %package devel +License: GPL v2 or later Summary: libdaemon is a lightweight C library that eases the writing of UNIX daemons. Group: Development/Libraries/C and C++ Requires: libdaemon0 = %{version} glibc-devel @@ -120,6 +131,7 @@ Authors: %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -150,22 +162,24 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libdaemon/*.h %changelog -* Tue Dec 18 2007 - seife@suse.de +* Thu Nov 27 2008 seife@suse.de +- fix compiler warning (bnc#449728) +* Tue Dec 18 2007 seife@suse.de - reenabled static libraries to fix ifplugd build -* Wed Nov 28 2007 - crrodriguez@suse.de +* Wed Nov 28 2007 crrodriguez@suse.de - libdaemon --> libdaemon0 - remove static libraries - remove "la" files - fix -devel package dependencies -* Thu Sep 13 2007 - mauro@suse.de +* Thu Sep 13 2007 mauro@suse.de - Applied a patch from upstream, to fix bnc #309132. -* Sun Jul 22 2007 - coolo@suse.de +* Sun Jul 22 2007 coolo@suse.de - disable lynx as it adds little featurewise (the README is packaged in the tar), but make libdaemon build pretty late and we need it -* Wed Jul 11 2007 - seife@suse.de +* Wed Jul 11 2007 seife@suse.de - Update to version 0.12 + make daemon_close_all() actually work properly -* Tue Jul 03 2007 - maw@suse.de +* Tue Jul 03 2007 maw@suse.de - Update to version 0.11 + automatically detect whether lynx is installed + properly set errno on every error condition @@ -176,23 +190,23 @@ rm -rf $RPM_BUILD_ROOT + add daemon_execv() in similar style + other fixes - Remove upstreamed libdaemon-attributes.patch. -* Thu Dec 14 2006 - seife@suse.de +* Thu Dec 14 2006 seife@suse.de - fix testd build -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sun Jan 22 2006 - cthiel@suse.de +* Sun Jan 22 2006 cthiel@suse.de - update to version 0.10 -* Mon Oct 31 2005 - dmueller@suse.de +* Mon Oct 31 2005 dmueller@suse.de - don't build as root -* Fri Sep 23 2005 - sbrabec@suse.cz +* Fri Sep 23 2005 sbrabec@suse.cz - Fixed devel dependencies. -* Tue May 31 2005 - ro@suse.de +* Tue May 31 2005 ro@suse.de - fix libdir in pkgconfig file -* Sat Feb 05 2005 - meissner@suse.de +* Sat Feb 05 2005 meissner@suse.de - added attributes -* Wed Jan 19 2005 - seife@suse.de +* Wed Jan 19 2005 seife@suse.de - update to version 0.7 -* Thu Aug 12 2004 - seife@suse.de +* Thu Aug 12 2004 seife@suse.de - add libpng to neededforbuild (now required by doxygen) -* Mon Jun 21 2004 - seife@suse.de +* Mon Jun 21 2004 seife@suse.de - initial package submission