[Python-modules-commits] r21188 - in packages/pymilter/trunk/debian (2 files)

[kitterman at users.alioth.debian.org]

    Date: Thursday, April 12, 2012 @ 17:18:06
  Author: kitterman
Revision: 21188

Improve debian/patches/BSD-have-ipv6.diff.

Modified:
  packages/pymilter/trunk/debian/changelog
  packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff

Modified: packages/pymilter/trunk/debian/changelog
===================================================================
--- packages/pymilter/trunk/debian/changelog	2012-04-11 21:19:18 UTC (rev 21187)
+++ packages/pymilter/trunk/debian/changelog	2012-04-12 17:18:06 UTC (rev 21188)
@@ -1,11 +1,11 @@
-pymilter (0.9.5-3) UNRELEASED; urgency=low
+pymilter (0.9.5-3) unstable; urgency=low
 
   * Add quilt as patch system (d/rules, d/control (build-dep), and
     README.source
   * Add debian/patches/BSD-have-ipv6.diff to fix 'initialization makes pointer
     from integer without a cast' warning on kFreeBSD
 
- -- Scott Kitterman <scott at kitterman.com>  Mon, 19 Mar 2012 17:41:32 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 12 Apr 2012 11:52:34 -0400
 
 pymilter (0.9.5-2) unstable; urgency=low
 

Modified: packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff
===================================================================
--- packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff	2012-04-11 21:19:18 UTC (rev 21187)
+++ packages/pymilter/trunk/debian/patches/BSD-have-ipv6.diff	2012-04-12 17:18:06 UTC (rev 21188)
@@ -1,19 +1,15 @@
-Patch suggested by upstream since kFreeBSD has IPv6 support.  Should fix
-'initialization makes pointer from integer without a cast' warning.
+Based on patch suggested by upstream since kFreeBSD has IPv6 support.  Should
+fix 'initialization makes pointer from integer without a cast' warning.
 Index: pymilter-0.9.5/miltermodule.c
 ===================================================================
---- pymilter-0.9.5.orig/miltermodule.c	2012-03-19 17:36:31.305556712 -0400
-+++ pymilter-0.9.5/miltermodule.c	2012-03-19 17:37:51.777554604 -0400
-@@ -263,10 +263,10 @@
+--- pymilter-0.9.5.orig/miltermodule.c	2011-06-09 11:45:27.000000000 -0400
++++ pymilter-0.9.5/miltermodule.c	2012-04-12 11:50:06.032687676 -0400
+@@ -263,7 +263,7 @@
   * published.  Unfortunately I know of now good way to do this
   * other than with OS-specific tests.
   */
 -#ifdef linux
-+//ifdef linux
++#if defined(__FreeBSD_kernel__) || defined(__linux__)
  #define HAVE_IPV6_RFC2553
  #include <arpa/inet.h>
--#endif
-+//endif
- #ifdef __HPUX
- /* only HP-UX 11.1 or greater supports IPv6 */
- #define HAVE_IPV6_RFC2553
+ #endif