This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch sid in repository glibc.
commit c58385b013ea7a0d5926977f35f47af21669beb0 Author: Samuel Thibault <samuel.thiba...@ens-lyon.org> Date: Sun Apr 24 17:35:47 2016 +0200 hurd: Fix IPV6_*PKT* macros. * hurd-i386/cvs-IPV6_PKTINFO.diff: Cherry-pick from upstream to fix IPV6_*PKT* macros. --- debian/changelog | 2 + debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff | 68 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 71 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1093701..ce7dd9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ glibc (2.22-8) UNRELEASED; urgency=medium [ Samuel Thibault ] * hurd-i386/cvs-gprof-tick.diff: Cherry-pick from upstream to fix gprof timing. + * hurd-i386/cvs-IPV6_PKTINFO.diff: Cherry-pick from upstream to fix + IPV6_*PKT* macros. [ Aurelien Jarno ] * patches/kfreebsd/local-sysdeps.diff: update to revision 6015 (from diff --git a/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff b/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff new file mode 100644 index 0000000..b5ba7f4 --- /dev/null +++ b/debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff @@ -0,0 +1,68 @@ +commit 2a517d91af918aecd9b603b7a09f696d774de3e6 +Author: Samuel Thibault <samuel.thiba...@ens-lyon.org> +Date: Sun Apr 24 17:22:57 2016 +0200 + + non-linux: Apply RFC3542 obsoletion of RFC2292 macros + + RFC2292 macros were obsoleted by RFC3542, and should not be exposed + any more. Notably since IPV6_PKTINFO has been reintroduced with a + completely different API. + + * bits/in.h (IPV6_PKTINFO): Rename to IPV6_2292PKTINFO. + (IPV6_HOPOPTS): Rename to IPV6_2292HOPOPTS. + (IPV6_DSTOPTS): Rename to IPV6_2292DSTOPTS. + (IPV6_RTHDR): Rename to IPV6_2292RTHDR. + (IPV6_PKTOPTIONS): Rename to IPV6_2292PKTOPTIONS. + (IPV6_HOPLIMIT): Rename to IPV6_2292HOPLIMIT. + (IPV6_RECVPKTINFO): New macro. + (IPV6_PKTINFO): New macro. + +diff --git a/bits/in.h b/bits/in.h +index e6f4696..a9efc74 100644 +--- a/bits/in.h ++++ b/bits/in.h +@@ -56,17 +56,17 @@ struct ip_opts + + /* IPV6 socket options. */ + #define IPV6_ADDRFORM 1 +-#define IPV6_PKTINFO 2 +-#define IPV6_HOPOPTS 3 +-#define IPV6_DSTOPTS 4 +-#define IPV6_RTHDR 5 +-#define IPV6_PKTOPTIONS 6 ++#define IPV6_2292PKTINFO 2 ++#define IPV6_2292HOPOPTS 3 ++#define IPV6_2292DSTOPTS 4 ++#define IPV6_2292RTHDR 5 ++#define IPV6_2292PKTOPTIONS 6 + #define IPV6_CHECKSUM 7 +-#define IPV6_HOPLIMIT 8 ++#define IPV6_2292HOPLIMIT 8 + +-#define IPV6_RXINFO IPV6_PKTINFO +-#define IPV6_TXINFO IPV6_PKTINFO +-#define SCM_SRCINFO IPV6_PKTINFO ++#define IPV6_RXINFO IPV6_2292PKTINFO ++#define IPV6_TXINFO IPV6_RXINFO ++#define SCM_SRCINFO IPV6_TXINFO + #define SCM_SRCRT IPV6_RXSRCRT + + #define IPV6_UNICAST_HOPS 16 +@@ -83,11 +83,15 @@ struct ip_opts + #define IPV6_JOIN_ANYCAST 27 + #define IPV6_LEAVE_ANYCAST 28 + ++/* Advanced API (RFC3542) (1). */ ++#define IPV6_RECVPKTINFO 49 ++#define IPV6_PKTINFO 50 ++ + /* Obsolete synonyms for the above. */ + #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP + #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP +-#define IPV6_RXHOPOPTS IPV6_HOPOPTS +-#define IPV6_RXDSTOPTS IPV6_DSTOPTS ++#define IPV6_RXHOPOPTS IPV6_2292HOPOPTS ++#define IPV6_RXDSTOPTS IPV6_2292DSTOPTS + + /* Routing header options for IPv6. */ + #define IPV6_RTHDR_LOOSE 0 /* Hop doesn't need to be neighbour. */ diff --git a/debian/patches/series b/debian/patches/series index 4f78bf4..09fc577 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -154,6 +154,7 @@ hurd-i386/cvs-mach-syscalls.mk.diff hurd-i386/cvs-auxv.diff #hurd-i386/submitted-anon-mmap-shared.diff hurd-i386/cvs-gprof-tick.diff +hurd-i386/cvs-IPV6_PKTINFO.diff i386/local-biarch.diff i386/local-cmov.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git