This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit 60f76a550176395daf9b22fdd345191092351402
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Sun Apr 24 19:27:06 2016 +0200

    Continue cherry-picking upstream fix for RFC3542 vs RFC2292
---
 debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff | 35 ++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff 
b/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff
index b5ba7f4..3dd5f61 100644
--- a/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff
+++ b/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff
@@ -17,6 +17,17 @@ Date:   Sun Apr 24 17:22:57 2016 +0200
        (IPV6_RECVPKTINFO): New macro.
        (IPV6_PKTINFO): New macro.
 
+commit d454fd21f4366fc529f83fdcd8a1113c5b49853e
+Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+Date:   Sun Apr 24 19:24:36 2016 +0200
+
+    non-linux: Apply RFC3542 obsoletion of RFC2292 macros
+    
+    (IPV6_RECVHOPLIMIT, IPV6_HOPLIMIT, IPV6_RECVHOPOPTS, IPV6_HOPOPTS,
+    IPV6_RTHDRDSTOPTS, IPV6_RECVRTHDR, IPV6_RTHDR, IPV6_RECVDSTOPTS,
+    IPV6_DSTOPTS, IPV6_RECVPATHMTU, IPV6_PATHMTU, IPV6_DONTFRAG):
+    New macros.
+
 diff --git a/bits/in.h b/bits/in.h
 index e6f4696..a9efc74 100644
 --- a/bits/in.h
@@ -66,3 +77,27 @@ index e6f4696..a9efc74 100644
  
  /* Routing header options for IPv6.  */
  #define IPV6_RTHDR_LOOSE      0       /* Hop doesn't need to be neighbour. */
+
+diff --git a/bits/in.h b/bits/in.h
+index a9efc74..d517115 100644
+--- a/bits/in.h
++++ b/bits/in.h
+@@ -86,6 +86,18 @@ struct ip_opts
+ /* Advanced API (RFC3542) (1).  */
+ #define IPV6_RECVPKTINFO      49
+ #define IPV6_PKTINFO          50
++#define IPV6_RECVHOPLIMIT     51
++#define IPV6_HOPLIMIT         52
++#define IPV6_RECVHOPOPTS      53
++#define IPV6_HOPOPTS          54
++#define IPV6_RTHDRDSTOPTS     55
++#define IPV6_RECVRTHDR                56
++#define IPV6_RTHDR            57
++#define IPV6_RECVDSTOPTS      58
++#define IPV6_DSTOPTS          59
++#define IPV6_RECVPATHMTU      60
++#define IPV6_PATHMTU          61
++#define IPV6_DONTFRAG         62
+ 
+ /* Obsolete synonyms for the above.  */
+ #define IPV6_ADD_MEMBERSHIP   IPV6_JOIN_GROUP

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Reply via email to