[Glibc-bsd-commits] r2236 - in trunk/freebsd-utils/debian: . patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-07-12 12:27:17 +0000 (Sat, 12 Jul 2008)
New Revision: 2236

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/015_pf.diff
Log:
* extend 015_pf.diff to be buildable also against libbsd 0.0-2



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2008-07-12 11:54:06 UTC (rev 2235)
+++ trunk/freebsd-utils/debian/changelog	2008-07-12 12:27:17 UTC (rev 2236)
@@ -3,6 +3,7 @@
   [ Petr Salinger ]
   * link against link_addr() and link_ntoa() from libfreebsd0,
     libbsd0 since 0.0-2 does not export them anymore
+  * extend 015_pf.diff to be buildable also against libbsd 0.0-2
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 12 Jul 2008 14:58:14 +0200
 

Modified: trunk/freebsd-utils/debian/patches/015_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/015_pf.diff	2008-07-12 11:54:06 UTC (rev 2235)
+++ trunk/freebsd-utils/debian/patches/015_pf.diff	2008-07-12 12:27:17 UTC (rev 2236)
@@ -130,7 +130,7 @@
  #include <netinet/icmp6.h>
  #include <net/pfvar.h>
  #include <arpa/inet.h>
-@@ -59,6 +59,14 @@
+@@ -59,6 +59,29 @@
  #include <ifaddrs.h>
  #include <unistd.h>
  
@@ -142,6 +142,21 @@
 +#define ICMP6_MEMBERSHIP_REPORT         131     /* group membership report */
 +#define ICMP6_MEMBERSHIP_REDUCTION      132     /* group membership termination */
 +#define ICMP6_DST_UNREACH_NOTNEIGHBOR 2 /* not a neighbor(obsolete) */
++#define MLD_LISTENER_QUERY              130     /* multicast listener query */
++#define MLD_LISTENER_REPORT             131     /* multicast listener report */
++#define MLD_LISTENER_DONE               132     /* multicast listener done */
++#define ICMP6_ROUTER_RENUMBERING        138     /* router renumbering */
++#define ICMP6_WRUREQUEST                139     /* who are you request */
++#define ICMP6_WRUREPLY                  140     /* who are you reply */
++#define ICMP6_FQDN_QUERY                139     /* FQDN query */
++#define ICMP6_FQDN_REPLY                140     /* FQDN reply */
++#define ICMP6_NI_QUERY                  139     /* node information request */
++#define ICMP6_NI_REPLY                  140     /* node information reply */
++#define MLD_MTRACE_RESP                 200     /* mtrace resp (to sender) */
++#define MLD_MTRACE                      201     /* mtrace messages */
++#define ICMP6_DST_UNREACH_BEYONDSCOPE   2       /* beyond scope of source address */
++#define ND_REDIRECT_ONLINK      0       /* redirect to an on-link node */
++#define ND_REDIRECT_ROUTER      1       /* redirect to a better router */
  #include "pfctl_parser.h"
  #include "pfctl.h"