[Pkg-utopia-commits] r3367 - in /packages/unstable/avahi/debian: changelog patches/20_avahi-daemon_kfreebsd.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jan 13 20:48:27 2010
New Revision: 3367

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3367
Log:
* debian/patches/20_avahi-daemon_kfreebsd.patch
  - Fix avahi-daemon on GNU/kFreeBSD. (Closes: #564607)
    Thanks to Julien BLACHE for the patch.

Added:
    packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch
Modified:
    packages/unstable/avahi/debian/changelog
    packages/unstable/avahi/debian/patches/series

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=3367&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Wed Jan 13 20:48:27 2010
@@ -4,6 +4,9 @@
     - Fix package description for libavahi-gobject0. (Closes: #528916)
     - Change section of avahi-ui-utils to utils. (Closes: #560830)
     - Bump Standards-Version to 3.8.3. No further changes.
+  * debian/patches/20_avahi-daemon_kfreebsd.patch
+    - Fix avahi-daemon on GNU/kFreeBSD. (Closes: #564607)
+      Thanks to Julien BLACHE for the patch.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 13 Jan 2010 21:25:47 +0100
 

Added: packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch?rev=3367&op=file
==============================================================================
--- packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch (added)
+++ packages/unstable/avahi/debian/patches/20_avahi-daemon_kfreebsd.patch Wed Jan 13 20:48:27 2010
@@ -1,0 +1,15 @@
+Description: Fix avahi-daemon for GNU/kFreeBSD
+Author: Julien BLACHE <jblache at debian.org>
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564607
+Bug: http://avahi.org/ticket/299
+--- avahi-0.6.25.orig/avahi-daemon/main.c
++++ avahi-0.6.25/avahi-daemon/main.c
+@@ -1307,7 +1307,7 @@
+ #endif
+ 
+     /* the sysctl() call from iface-pfroute.c needs locked memory on FreeBSD */
+-#if defined(RLIMIT_MEMLOCK) && !defined(__FreeBSD__)
++#if defined(RLIMIT_MEMLOCK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+     /* We don't need locked memory */
+     set_one_rlimit(RLIMIT_MEMLOCK, 0, "RLIMIT_MEMLOCK");
+ #endif

Modified: packages/unstable/avahi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/series?rev=3367&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/series (original)
+++ packages/unstable/avahi/debian/patches/series Wed Jan 13 20:48:27 2010
@@ -1,3 +1,5 @@
+# Debian patches for Avahi
 01_avahi-daemon.conf.patch
 11_avahi-autoipd.action-add-routes.patch
 15-manpage-typo-fixes.patch
+20_avahi-daemon_kfreebsd.patch