--- libdaemon-0.12.orig/config.log +++ libdaemon-0.12/config.log @@ -0,0 +1,212 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by libdaemon configure 0.12, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --prefix=/usr --mandir=${prefix}/share/man --infodir=${prefix}/share/info CFLAGS=-Wall -g -O2 LDFLAGS=-Wl,-z,defs + +## --------- ## +## Platform. ## +## --------- ## + +hostname = beast +uname -m = x86_64 +uname -r = 2.6.24-1-amd64 +uname -s = Linux +uname -v = #1 SMP Thu Mar 27 16:52:38 UTC 2008 + +/usr/bin/uname -p = unknown +/bin/uname -X = unknown + +/bin/arch = unknown +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +/usr/bin/hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH: /home/sjoerd/bin +PATH: /usr/lib/ccache +PATH: /usr/local/bin +PATH: /usr/bin +PATH: /bin +PATH: /usr/games +PATH: /sbin +PATH: /usr/X11R6/bin/ +PATH: /usr/local/sbin +PATH: /usr/local/bin +PATH: /usr/sbin +PATH: /bin +PATH: /usr/sbin/X11 +PATH: /usr/games + + +## ----------- ## +## Core tests. ## +## ----------- ## + +configure:1984: checking for a BSD-compatible install +configure:2040: result: /usr/bin/install -c +configure:2051: checking whether build environment is sane + +## ---------------- ## +## Cache variables. ## +## ---------------- ## + +ac_cv_env_CCC_set= +ac_cv_env_CCC_value= +ac_cv_env_CC_set= +ac_cv_env_CC_value= +ac_cv_env_CFLAGS_set=set +ac_cv_env_CFLAGS_value='-Wall -g -O2' +ac_cv_env_CPPFLAGS_set=set +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CPP_set= +ac_cv_env_CPP_value= +ac_cv_env_CXXCPP_set= +ac_cv_env_CXXCPP_value= +ac_cv_env_CXXFLAGS_set=set +ac_cv_env_CXXFLAGS_value='-g -O2' +ac_cv_env_CXX_set= +ac_cv_env_CXX_value= +ac_cv_env_F77_set= +ac_cv_env_F77_value= +ac_cv_env_FFLAGS_set=set +ac_cv_env_FFLAGS_value='-g -O2' +ac_cv_env_LDFLAGS_set=set +ac_cv_env_LDFLAGS_value=-Wl,-z,defs +ac_cv_env_LIBS_set= +ac_cv_env_LIBS_value= +ac_cv_env_build_alias_set=set +ac_cv_env_build_alias_value=x86_64-linux-gnu +ac_cv_env_host_alias_set=set +ac_cv_env_host_alias_value=x86_64-linux-gnu +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= +ac_cv_path_install='/usr/bin/install -c' + +## ----------------- ## +## Output variables. ## +## ----------------- ## + +ACLOCAL='' +AMDEPBACKSLASH='' +AMDEP_FALSE='' +AMDEP_TRUE='' +AMTAR='' +AR='' +AUTOCONF='' +AUTOHEADER='' +AUTOMAKE='' +AWK='' +CC='' +CCDEPMODE='' +CFLAGS='-Wall -g -O2' +CPP='' +CPPFLAGS='' +CXX='' +CXXCPP='' +CXXDEPMODE='' +CXXFLAGS='-g -O2' +CYGPATH_W='' +DEFS='' +DEPDIR='' +ECHO='echo' +ECHO_C='' +ECHO_N='-n' +ECHO_T='' +EGREP='' +EXEEXT='' +F77='' +FFLAGS='-g -O2' +GREP='' +INSTALL_DATA='${INSTALL} -m 644' +INSTALL_PROGRAM='${INSTALL}' +INSTALL_SCRIPT='${INSTALL}' +INSTALL_STRIP_PROGRAM='' +LDFLAGS='-Wl,-z,defs' +LIBOBJS='' +LIBS='' +LIBTOOL='' +LN_S='' +LTLIBOBJS='' +MAKEINFO='' +OBJEXT='' +PACKAGE='' +PACKAGE_BUGREPORT='mzqnrzba (at) 0pointer (dot) de' +PACKAGE_NAME='libdaemon' +PACKAGE_STRING='libdaemon 0.12' +PACKAGE_TARNAME='libdaemon' +PACKAGE_URL='' +PACKAGE_VERSION='0.12' +PATH_SEPARATOR=':' +RANLIB='' +SET_MAKE='' +SHELL='/bin/sh' +STRIP='' +USE_LYNX_FALSE='' +USE_LYNX_TRUE='' +VERSION='' +ac_ct_CC='' +ac_ct_CXX='' +ac_ct_F77='' +am__fastdepCC_FALSE='' +am__fastdepCC_TRUE='' +am__fastdepCXX_FALSE='' +am__fastdepCXX_TRUE='' +am__include='' +am__leading_dot='' +am__quote='' +am__tar='' +am__untar='' +bindir='${exec_prefix}/bin' +build='x86_64-linux-gnu' +build_alias='x86_64-linux-gnu' +build_cpu='' +build_os='' +build_vendor='' +datadir='${datarootdir}' +datarootdir='${prefix}/share' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +dvidir='${docdir}' +exec_prefix='NONE' +have_lynx='' +host='x86_64-linux-gnu' +host_alias='x86_64-linux-gnu' +host_cpu='' +host_os='' +host_vendor='' +htmldir='${docdir}' +includedir='${prefix}/include' +infodir='${prefix}/share/info' +install_sh='' +libdir='${exec_prefix}/lib' +libexecdir='${exec_prefix}/libexec' +localedir='${datarootdir}/locale' +localstatedir='${prefix}/var' +mandir='${prefix}/share/man' +mkdir_p='' +oldincludedir='/usr/include' +pdfdir='${docdir}' +prefix='/usr' +program_transform_name='s,x,x,' +psdir='${docdir}' +sbindir='${exec_prefix}/sbin' +sharedstatedir='${prefix}/com' +sysconfdir='${prefix}/etc' +target_alias='' + +## ----------- ## +## confdefs.h. ## +## ----------- ## + +#define PACKAGE_NAME "libdaemon" +#define PACKAGE_TARNAME "libdaemon" +#define PACKAGE_VERSION "0.12" +#define PACKAGE_STRING "libdaemon 0.12" +#define PACKAGE_BUGREPORT "mzqnrzba (at) 0pointer (dot) de" + +configure: caught signal 2 +configure: exit 1 --- libdaemon-0.12.orig/debian/compat +++ libdaemon-0.12/debian/compat @@ -0,0 +1 @@ +5 --- libdaemon-0.12.orig/debian/libdaemon0.shlibs +++ libdaemon-0.12/debian/libdaemon0.shlibs @@ -0,0 +1 @@ +libdaemon 0 libdaemon0 (>= 0.11) --- libdaemon-0.12.orig/debian/libdaemon-dev.docs +++ libdaemon-0.12/debian/libdaemon-dev.docs @@ -0,0 +1,3 @@ +doc/reference/html +doc/README.html +doc/style.css --- libdaemon-0.12.orig/debian/rules +++ libdaemon-0.12/debian/rules @@ -0,0 +1,94 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: patch configure-stamp +configure-stamp: + dh_testdir + [ ! -f libdaemon.spec ] || mv -f libdaemon.spec libdaemon.spec.ups +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + [ ! -f config.sub ] || mv -f config.sub config.sub.ups + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + [ ! -f config.guess ] || mv -f config.guess config.guess.ups + cp -f /usr/share/misc/config.guess config.guess +endif + [ ! -f doc/README.html ] || mv -f doc/README.html doc/README.html.ups + [ ! -f doc/README ] || mv -f doc/README doc/README.ups + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + touch $@ + +build: build-stamp +build-stamp: patch-stamp config.status + dh_testdir + $(MAKE) + $(MAKE) doxygen + sed -i -e 's/ -1 / \\-1 /g' -e 's/ -1\./ \\-1./g' $(CURDIR)/doc/reference/man/man3/dfork.h.3 + sed -i -e 's/\\fI\.\.\.\\fP/\\fI\\\&.\\.\\.\\fP/g' $(CURDIR)/doc/reference/man/man3/dexec.h.3 + touch $@ + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) distclean + rm -rf doc/reference + dh_clean + [ ! -f doc/README.ups ] || mv -f doc/README.ups doc/README + [ ! -f doc/README.html.ups ] || mv -f doc/README.html.ups doc/README.html + [ ! -f config.guess.ups ] || mv -f config.guess.ups config.guess + [ ! -f config.sub.ups ] || mv -f config.sub.ups config.sub + [ ! -f libdaemon.spec.ups ] || mv -f libdaemon.spec.ups libdaemon.spec + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -p libdaemon-dev README + dh_installchangelogs -N libdaemon-dev + dh_installdocs + dh_installexamples + dh_install --sourcedir=debian/tmp + dh_installman + dh_link + dh_strip --dbg-package=libdaemon0-dbg + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch --- libdaemon-0.12.orig/debian/libdaemon-dev.examples +++ libdaemon-0.12/debian/libdaemon-dev.examples @@ -0,0 +1 @@ +examples/testd.c --- libdaemon-0.12.orig/debian/docs +++ libdaemon-0.12/debian/docs @@ -0,0 +1 @@ +README --- libdaemon-0.12.orig/debian/watch +++ libdaemon-0.12/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://0pointer.de/lennart/projects/libdaemon/libdaemon-(.*)\.tar\.gz --- libdaemon-0.12.orig/debian/libdaemon-dev.manpages +++ libdaemon-0.12/debian/libdaemon-dev.manpages @@ -0,0 +1 @@ +doc/reference/man/man3/*.3 --- libdaemon-0.12.orig/debian/copyright +++ libdaemon-0.12/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Oliver Kurth on +Fri, 11 Jul 2003 22:03:30 +0200. + +It was downloaded from http://0pointer.de/lennart/projects/libdaemon/ + +Upstream Author: + + Lennart Poettering + +Copyright: + + Copyright (C) 2003-2007 Lennart Poettering + +License: + + libdaemon is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + libdaemon 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License the Debian GNU/Linux distribution in the file + /usr/share/common-licenses/LGPL; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +The Debian packaging is +Copyright (C) 2003-2007, Oliver Kurth +Copyright (C) 2007-2008, Y Giridhar Appaji Nag and +is licensed under the GNU GPL, either version 2 of the License, or (at +your option) any later version; see `/usr/share/common-licenses/GPL-2'. --- libdaemon-0.12.orig/debian/libdaemon-dev.install +++ libdaemon-0.12/debian/libdaemon-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* --- libdaemon-0.12.orig/debian/control +++ libdaemon-0.12/debian/control @@ -0,0 +1,67 @@ +Source: libdaemon +Section: libs +Priority: optional +Maintainer: Y Giridhar Appaji Nag +Build-Depends: debhelper (>= 5), dpatch, autotools-dev, doxygen, lynx +Standards-Version: 3.7.3 +Homepage: http://0pointer.de/lennart/projects/libdaemon/ +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/libdaemon/unstable +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/libdaemon/unstable/?op=log + +Package: libdaemon-dev +Section: libdevel +Architecture: any +Depends: libdaemon0 (= ${binary:Version}) +Description: lightweight C library for daemons - development files + libdaemon is a leightweight C library which eases the writing of UNIX daemons. + It consists of the following parts: + . + * Wrapper around fork() for correct daemonization of a process + * Wrapper around syslog() for simple log output to syslog or STDERR + * An API for writing PID files + * An API for serializing signals into a pipe for use with select() or poll() + * An API for running subprocesses with STDOUT and STDERR redirected to syslog + . + Routines like these are included in most of the daemon software available. It + is not simple to get these done right and code duplication is not acceptable. + . + This package includes the header files and the static version of the library + and documentation. + +Package: libdaemon0 +Architecture: any +Depends: ${shlibs:Depends} +Description: lightweight C library for daemons - runtime library + libdaemon is a leightweight C library which eases the writing of UNIX daemons. + It consists of the following parts: + . + * Wrapper around fork() for correct daemonization of a process + * Wrapper around syslog() for simple log output to syslog or STDERR + * An API for writing PID files + * An API for serializing signals into a pipe for use with select() or poll() + * An API for running subprocesses with STDOUT and STDERR redirected to syslog + . + Routines like these are included in most of the daemon software available. It + is not simple to get these done right and code duplication is not acceptable. + . + This package includes the libdaemon run time shared library. + +Package: libdaemon0-dbg +Section: libdevel +Architecture: any +Priority: extra +Depends: libdaemon0 (= ${binary:Version}) +Description: lightweight C library for daemons - debugging symbols + libdaemon is a leightweight C library which eases the writing of UNIX daemons. + It consists of the following parts: + . + * Wrapper around fork() for correct daemonization of a process + * Wrapper around syslog() for simple log output to syslog or STDERR + * An API for writing PID files + * An API for serializing signals into a pipe for use with select() or poll() + * An API for running subprocesses with STDOUT and STDERR redirected to syslog + . + Routines like these are included in most of the daemon software available. It + is not simple to get these done right and code duplication is not acceptable. + . + This package contains the debugging symbols for libdaemon. --- libdaemon-0.12.orig/debian/changelog +++ libdaemon-0.12/debian/changelog @@ -0,0 +1,109 @@ +libdaemon (0.12-2) unstable; urgency=low + + * Improved package description, per dev-ref (v3.3.9) Section 6.2.2 etc. + * Use dpatch for the following debian/patches patches from upstream + + 01_sighandler_errno to save and restore errno in signal hanlder + + 02_pid_file_O_RDONLY to fallback to O_RDONLY for PID file if O_RDWR + doesn't work. + * Fix lintian W: manpage-has-errors-from-man that was resulting in not + showing the help text of daemon_exec's last argument. + + -- Y Giridhar Appaji Nag Mon, 14 Apr 2008 00:56:12 +0530 + +libdaemon (0.12-1) unstable; urgency=low + + * Adopted by Y Giridhar Appaji Nag (Closes: #452187) + * debian/control: Add Homepage: and Vcs-*: fields + * Add a debian/watch file + * Bump up Standards-Version to 3.7.3. s/Source-Version/binary:Version/ + * Add autotools-dev to Build-Depends and remove lynx-ssl (provided by lynx). + * Update debian/compat to 5, update Build-Depends with debhelper (>= 5) + * debian/copyright: Update upstream author email address and URL + * Use .docs and .examples file rather than specifying them in debian/rules + * debian/control: Change Section of libdaemon-dev to libdevel + * debian/rules: Modify the doxygen generated man pages to prevent lintian I: + hyphen-used-as-minus-sign + * Install upstream README as upstream changelog for libdaemon-dev + * Provide a libdaemon0-dbg package with the debugging symbols in it. + + -- Y Giridhar Appaji Nag Fri, 21 Dec 2007 15:53:37 +0530 + +libdaemon (0.12-0.1) unstable; urgency=low + + * NMU + * New upstream release + * Patch applied to 0.11-0.2 merged upstream. + + -- Sjoerd Simons Tue, 10 Jul 2007 20:46:12 +0200 + +libdaemon (0.11-0.2) unstable; urgency=low + + * NMU + * Added patch to fix daemon_close_all implementation. + + -- Sjoerd Simons Sat, 07 Jul 2007 11:45:30 +0200 + +libdaemon (0.11-0.1) unstable; urgency=low + + * NMU + * New upstream release (Closes: #430163) + * No longer uses PATH_MAX unconditionnally (Closes: #407867) + * debian/libdaemon0.shlibs, added + * debian/control, indicate that the source package should be in Section libs + * debian/rules, pass CFLAGS that could have been changed as a result of + DEB_BUILD_OPTIONS to configure (Closes: #328774) + * debian/libdaemon-dev.install, don't install .la files + + -- Sjoerd Simons Fri, 06 Jul 2007 13:54:23 +0200 + +libdaemon (0.10-1) unstable; urgency=low + + * new upstream, relicensed under LGPL 2.1 + + -- Oliver Kurth Mon, 28 Nov 2005 10:23:53 -0800 + +libdaemon (0.8-1) unstable; urgency=low + + * new upstream (closes: #314615) + + -- Oliver Kurth Fri, 17 Jun 2005 10:14:17 -0700 + +libdaemon (0.7-1) unstable; urgency=low + + * new upstream + - documentation error for daemon_signal_init corrected + (closes: #280833) + * build-depends on lynx|lynx-ssl (closes: #265980) + + -- Oliver Kurth Mon, 20 Dec 2004 17:10:04 -0800 + +libdaemon (0.6-1) unstable; urgency=low + + * new upstream + + -- Oliver Kurth Wed, 07 Apr 2004 23:03:53 +0200 + +libdaemon (0.5-1) unstable; urgency=low + + * new upstream + + -- Oliver Kurth Sat, 28 Feb 2004 20:59:58 -0800 + +libdaemon (0.4-1) unstable; urgency=low + + * new upstream + + -- Oliver Kurth Tue, 27 Jan 2004 21:41:44 +0100 + +libdaemon (0.3-1) unstable; urgency=low + + * new upstreaam + + -- Oliver Kurth Fri, 11 Jul 2003 22:03:30 +0200 + +libdaemon (0.2-1) unstable; urgency=low + + * Initial Release. Closes: #200793 + + -- Oliver Kurth Fri, 11 Jul 2003 22:03:30 +0200 + --- libdaemon-0.12.orig/debian/libdaemon0.install +++ libdaemon-0.12/debian/libdaemon0.install @@ -0,0 +1 @@ +usr/lib/libdaemon*.so.* --- libdaemon-0.12.orig/debian/patches/02_pid_file_O_RDONLY.dpatch +++ libdaemon-0.12/debian/patches/02_pid_file_O_RDONLY.dpatch @@ -0,0 +1,42 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_pid_file_O_RDONLY.dpatch by Y Giridhar Appaji Nag +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to fallback to O_RDONLY for PID file if O_RDWR doesn't work. +## DP: Based on upstream commit r131 (git a205fe19b78d44170661dbb624b5166220254f72) + +@DPATCH@ +diff -urNad libdaemon-0.12~/libdaemon/dpid.c libdaemon-0.12/libdaemon/dpid.c +--- libdaemon-0.12~/libdaemon/dpid.c 2007-07-10 23:28:34.000000000 +0530 ++++ libdaemon-0.12/libdaemon/dpid.c 2008-04-14 00:18:07.000000000 +0530 +@@ -69,6 +69,14 @@ + f.l_len = 0; + + if (fcntl(fd, F_SETLKW, &f) < 0) { ++ ++ if (enable && errno == EBADF) { ++ f.l_type = F_RDLCK; ++ ++ if (fcntl(fd, F_SETLKW, &f) >= 0) ++ return 0; ++ } ++ + daemon_log(LOG_WARNING, "fcntl(F_SETLKW) failed: %s", strerror(errno)); + return -1; + } +@@ -91,10 +99,12 @@ + } + + if ((fd = open(fn, O_RDWR, 0644)) < 0) { +- if (errno != ENOENT) +- daemon_log(LOG_WARNING, "Failed to open PID file: %s", strerror(errno)); ++ if ((fd = open(fn, O_RDONLY, 0644)) < 0) { ++ if (errno != ENOENT) ++ daemon_log(LOG_WARNING, "Failed to open PID file: %s", strerror(errno)); + +- goto finish; ++ goto finish; ++ } + } + + if ((locked = lock_file(fd, 1)) < 0) --- libdaemon-0.12.orig/debian/patches/00list +++ libdaemon-0.12/debian/patches/00list @@ -0,0 +1,2 @@ +01_sighandler_errno +02_pid_file_O_RDONLY --- libdaemon-0.12.orig/debian/patches/01_sighandler_errno.dpatch +++ libdaemon-0.12/debian/patches/01_sighandler_errno.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_sighandler_errno.dpatch by Y Giridhar Appaji Nag +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to save and restore errno in signal handler. Based on upstream +## DP: commit r132 (git 2c8a74724ba0d799463a5fe8755004f4b0169749) + +@DPATCH@ +diff -urNad libdaemon-0.12~/libdaemon/dsignal.c libdaemon-0.12/libdaemon/dsignal.c +--- libdaemon-0.12~/libdaemon/dsignal.c 2007-07-10 23:28:34.000000000 +0530 ++++ libdaemon-0.12/libdaemon/dsignal.c 2008-04-14 00:14:25.000000000 +0530 +@@ -37,7 +37,9 @@ + static int _signal_pipe[2] = { -1, -1 }; + + static void _sigfunc(int s) { ++ int saved_errno = errno; + write(_signal_pipe[1], &s, sizeof(s)); ++ errno = saved_errno; + } + + static int _init(void) {