[Pkg-haskell-commits] darcs: haskell-network-info: New upstream release

[Joachim Breitner]

Mon Jun 29 09:43:58 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog +6
    R ./patches/hurd-compat
    R ./patches/series
    R ./patches/

Mon Jun 29 09:43:58 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-haskell-network-info/changelog new-haskell-network-info/changelog
--- old-haskell-network-info/changelog	2015-06-29 20:35:17.853574035 +0000
+++ new-haskell-network-info/changelog	2015-06-29 20:35:17.857574033 +0000
@@ -1,3 +1,9 @@
+haskell-network-info (0.2.0.6-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 29 Jun 2015 11:43:30 +0200
+
 haskell-network-info (0.2.0.5-4) unstable; urgency=medium
 
   * Add hurd compat patch by Gabriele Giacone (Closes: 753405 
diff -rN -u old-haskell-network-info/patches/hurd-compat new-haskell-network-info/patches/hurd-compat
--- old-haskell-network-info/patches/hurd-compat	2015-06-29 20:35:17.853574035 +0000
+++ new-haskell-network-info/patches/hurd-compat	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-Forwarded to https://github.com/jystic/network-info/pull/12
-
---- haskell-network-info-0.2.0.5.orig/cbits/network-unix.c
-+++ haskell-network-info-0.2.0.5/cbits/network-unix.c
-@@ -18,10 +18,12 @@
- #         define AF_PACKET AF_LINK
- #      endif
- #   endif
--#   ifdef __sun
-+#   if defined(__sun) || defined(__GNU__)
- #      include <net/if_arp.h>
--#      include <unistd.h>
- #      include <stropts.h>
-+#   endif
-+#   ifdef __sun
-+#      include <unistd.h>
- #      include <sys/sockio.h>
- #   endif
- #endif
-@@ -33,7 +35,7 @@
- #include "network.h"
- #include "common.h"
- 
--#if defined(__sun) || !defined(AF_PACKET)
-+#if defined(__sun) || (!defined(AF_PACKET) && defined(SIOCGARP))
- int maccopy_arp(unsigned char *dst, struct sockaddr *addr)
- {
-     // SOURCE DERIVED FROM: http://www.pauliesworld.org/project/getmac.c
-@@ -130,14 +132,14 @@ int c_get_network_interfaces(struct netw
-         family = addr->sa_family;
-         if (family == AF_INET) {
-             ipv4copy(&n->ip_address, addr);
--#if defined(__sun) || !defined(AF_PACKET)
-+#if defined(__sun) || (!defined(AF_PACKET) && defined(SIOCGARP))
-             if ((ifa->ifa_flags & IFF_LOOPBACK) == 0) {
-                 maccopy_arp(n->mac_address, addr);
-             }
- #endif
-         } else if (family == AF_INET6) {
-             ipv6copy(&n->ip6_address, addr);
--#if defined(__sun) || !defined(AF_PACKET)
-+#if defined(__sun) || (!defined(AF_PACKET) && defined(SIOCGARP))
-             if ((ifa->ifa_flags & IFF_LOOPBACK) == 0) {
-                 maccopy_arp(n->mac_address, addr);
-             }
diff -rN -u old-haskell-network-info/patches/series new-haskell-network-info/patches/series
--- old-haskell-network-info/patches/series	2015-06-29 20:35:17.853574035 +0000
+++ new-haskell-network-info/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-hurd-compat