[Initscripts-ng-commits] r1024 - in /trunk/src/insserv/debian: changelog patches/96_hurd_no_at_funcs.patch patches/series

[pere at users.alioth.debian.org]

Author: pere
Date: Sun Sep 27 13:47:10 2009
New Revision: 1024

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1024
Log:
New patch 96_hurd_no_at_funcs.patch to try harder to get the
source building on hurd, where for example the readlinkat() symbol
exist in libc but always fail.

Added:
    trunk/src/insserv/debian/patches/96_hurd_no_at_funcs.patch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/series

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1024&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Sep 27 13:47:10 2009
@@ -11,6 +11,9 @@
     jobs (Closes: #547235).  Add testsuite test to ensure that it is
     working.
   * Refreshed all patches.
+  * New patch 96_hurd_no_at_funcs.patch to try harder to get the
+    source building on hurd, where for example the readlinkat() symbol
+    exist in libc but always fail.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 20 Sep 2009 22:05:40 +0200
 

Added: trunk/src/insserv/debian/patches/96_hurd_no_at_funcs.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/96_hurd_no_at_funcs.patch?rev=1024&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/96_hurd_no_at_funcs.patch (added)
+++ trunk/src/insserv/debian/patches/96_hurd_no_at_funcs.patch Sun Sep 27 13:47:10 2009
@@ -1,0 +1,50 @@
+Purpose: Try to get insserv building on hurd, by avoiding the dummy *at
+         functions which exist in libc but always return an error.
+Status:  Not yet submitted upstream.
+
+---
+Index: insserv/listing.h
+===================================================================
+--- insserv.orig/listing.h	2009-09-27 15:45:38.000000000 +0200
++++ insserv/listing.h	2009-09-27 15:45:38.000000000 +0200
+@@ -307,7 +307,7 @@
+ #define xreset(ptr)	\
+ 	{char *restrict tmp = (char *restrict)ptr; if (ptr && *tmp) free(ptr);} ptr = NULL
+ 
+-#if defined(HAS_unlinkat) && defined(_ATFILE_SOURCE)
++#if defined(HAS_unlinkat) && defined(_ATFILE_SOURCE) && defined(AT_FDCWD)
+ # define xremove(d,x) (__extension__ ({ if ((dryrun ? 0 : \
+ 	(unlinkat(d,x,0) != 0 && (errno != EISDIR || unlinkat(d,x,AT_REMOVEDIR) != 0)))) \
+ 	warn ("can not remove(%s%s): %s\n", rcd, x, strerror(errno)); \
+@@ -319,7 +319,7 @@
+ 	else \
+ 	info(1, "remove service %s/%s%s\n", path, rcd, x); }))
+ #endif
+-#if defined(HAS_symlinkat) && defined(_ATFILE_SOURCE)
++#if defined(HAS_symlinkat) && defined(_ATFILE_SOURCE) && defined(AT_FDCWD)
+ # define xsymlink(d,x,y) (__extension__ ({ if ((dryrun ? 0 : (symlinkat(x, d, y) != 0))) \
+ 	warn ("can not symlink(%s, %s%s): %s\n", x, rcd, y, strerror(errno)); \
+ 	else \
+@@ -330,19 +330,19 @@
+ 	else \
+ 	info(1, "enable service %s -> %s/%s%s\n", x, path, rcd, y); }))
+ #endif
+-#if defined(HAS_fstatat) && defined(_ATFILE_SOURCE)
++#if defined(HAS_fstatat) && defined(_ATFILE_SOURCE) && defined(AT_FDCWD)
+ # define xstat(d,x,s)	(__extension__ ({ fstatat(d,x,s, 0); }))
+ # define xlstat(d,x,s)	(__extension__ ({ fstatat(d,x,s, AT_SYMLINK_NOFOLLOW); }))
+ #else
+ # define xstat(d,x,s)	(__extension__ ({ stat(x,s); }))
+ # define xlstat(d,x,s)	(__extension__ ({ lstat(x,s); }))
+ #endif
+-#if defined(HAS_readlinkat) && defined(_ATFILE_SOURCE)
++#if defined(HAS_readlinkat) && defined(_ATFILE_SOURCE) && defined(AT_FDCWD)
+ # define xreadlink(d,x,b,l)	(__extension__ ({ readlinkat(d,x,b,l); }))
+ #else
+ # define xreadlink(d,x,b,l)	(__extension__ ({ readlink(x,b,l); }))
+ #endif
+-#if defined(HAS_openat) && defined(_ATFILE_SOURCE)
++#if defined(HAS_openat) && defined(_ATFILE_SOURCE) && defined(AT_FDCWD)
+ # define xopen(d,x,f)	(__extension__ ({ openat(d,x,f); }))
+ #else
+ # define xopen(d,x,f)	(__extension__ ({ open(x,f); }))

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1024&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Sun Sep 27 13:47:10 2009
@@ -19,3 +19,4 @@
 93_hurd_no_path_max.patch
 94_v1_12_2.patch
 95_stop_all.patch
+96_hurd_no_at_funcs.patch