[Pkg-cups-devel] r784 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Thu Jun 12 17:47:41 2008
New Revision: 784

Log:
* Add glibc2.8_build.dpatch: Fix building with glibc 2.8.

Added:
   cupsys/trunk/debian/patches/glibc2.8_build.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Thu Jun 12 17:47:41 2008
@@ -3,8 +3,9 @@
   * debian/cups.init.d: Restart xprint on start/stop/reload. (Closes: #285332)
   * Add empty_option_value_crash.dpatch: Fix crash on cupsd.conf options
     without a value. (Closes: #250848)
+  * Add glibc2.8_build.dpatch: Fix building with glibc 2.8.
 
- -- Martin Pitt <mpitt at debian.org>  Wed, 11 Jun 2008 11:20:55 +0200
+ -- Martin Pitt <mpitt at debian.org>  Thu, 12 Jun 2008 19:07:57 +0200
 
 cups (1.3.7-7) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Thu Jun 12 17:47:41 2008
@@ -4,6 +4,9 @@
 pdftops-cups-1.4.dpatch
 pdftops-dont_fail_on_cancel.dpatch
 
+# patches sent upstream
+glibc2.8_build.dpatch
+
 # Debian patches
 freebsd.dpatch
 removecvstag.dpatch

Added: cupsys/trunk/debian/patches/glibc2.8_build.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/glibc2.8_build.dpatch	Thu Jun 12 17:47:41 2008
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## glibc2.8_build.dpatch by Martin Pitt <mpitt at debian.org>
+##
+## DP: Fix build with glibc >= 2.8, which hid struct ucred behind _GNU_SOURCE.
+## DP: STR#2860
+
+ at DPATCH@
+diff -urNad trunk~/scheduler/auth.c trunk/scheduler/auth.c
+--- trunk~/scheduler/auth.c	2008-03-20 20:58:16.000000000 +0000
++++ trunk/scheduler/auth.c	2008-06-12 17:06:34.000000000 +0000
+@@ -54,6 +54,8 @@
+  * Include necessary headers...
+  */
+ 
++#define _GNU_SOURCE   /* for struct ucred on glibc >= 2.8 */
++
+ #include "cupsd.h"
+ #include <grp.h>
+ #ifdef HAVE_SHADOW_H