SHA256
1
0
forked from pool/iproute2
iproute2/xfrm-support-displaying-transformations-used-for-Mob.patch

54 lines
2.0 KiB
Diff
Raw Normal View History

From: Jan Engelhardt <jengelh@inai.de>
Accepting request 518382 from home:mkubecek:branches:security:netfilter First of all, I would like to apologize for this submit request, if it was up to me, I would never send it. I strongly believe it's package maintainer's job to decide how a package should be organized, what should the specfile look like, how should patches be named and what format to use etc. That's why I really dislike the idea of pushing package maintainer to accept someone else's preferences. I've been forced to submit it but you shouldn't feel obliged to accept it unless you really like it. Except for some minor differences, this is a cleanup I did for SLE15 iproute2 package submission. In order to effectively maintain the package throughout the SLE15 lifetime (planned to be 13+ years), I'm using a git repository to prepare, handle and track patches and prefer to have them in uniform format with annotations similar to ones we use in openSUSE/SLE kernel packages. While this workflow proved beneficial for SLE11 and SLE12 maintenance in last few years, I don't think it's worth the extra work for Factory package with only has few patches which are either permanent or only stay there for relatively short time. Also, with random one-time contributors to Factory package, it would be even more difficult to keep the package cleaned up. The problem is that we have so-called "Factory first" policy. In theory, this should mean no features or bugfixes should be added to SLE packages unless they are also in the respective Factory package (and preferrably also upstream) or at least submitted there. This idea sounds reasonable but the SLE15 review team interprets the policy in rather different way: they want even the contents Factory and SLE15 packages in OBS to look (almost) the same and enforce that by declining submissions that differ from Factory in non-trivial way. For six weeks I tried to appeal to common sense and explain that those two packages only differ in "metadata coding style" and that if SLE and openSUSE packages are maintained by different people, there is no need for one of them to adopt the other's preferences (and that the packages will start to differ soon anyway). They were adamant and in the end, they made it absolutely clear that there is no way the SLE15 submission can be accepted unless I at least submit my cleanup to Factory devel project. They didn't say it has to be accepted, though, so here it is but it's completely up to you if you want it or not. Once again, I'm sorry about dragging you into this, I wanted to avoid it but I ran out of options. Summary of the changes: - patches are regenerated using git - patches are annotated the way we use in kernel packages (the annotations make more sense for upstream backports but we currently don't have any in Factory) - one patch (iproute2-HZ.diff) is split into two - Patch* lines are moved out of the rest of tags for easier orientation - conditionally applied patches are moved to the end of the series - all patches are applied in both specfiles so that both builds use the same source tree OBS-URL: https://build.opensuse.org/request/show/518382 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=144
2017-08-23 23:59:19 +02:00
Date: Wed, 21 Jan 2015 22:57:10 +0100
Subject: xfrm: support displaying transformations used for Mobile IPv6
Patch-mainline: No
Patch taken from mip6d-ng c397c3b4a16bb2e31a86f6c5e344a1278d1577c5
and included in openSUSE so as to facilitate mip6d-ng.
---
Accepting request 518382 from home:mkubecek:branches:security:netfilter First of all, I would like to apologize for this submit request, if it was up to me, I would never send it. I strongly believe it's package maintainer's job to decide how a package should be organized, what should the specfile look like, how should patches be named and what format to use etc. That's why I really dislike the idea of pushing package maintainer to accept someone else's preferences. I've been forced to submit it but you shouldn't feel obliged to accept it unless you really like it. Except for some minor differences, this is a cleanup I did for SLE15 iproute2 package submission. In order to effectively maintain the package throughout the SLE15 lifetime (planned to be 13+ years), I'm using a git repository to prepare, handle and track patches and prefer to have them in uniform format with annotations similar to ones we use in openSUSE/SLE kernel packages. While this workflow proved beneficial for SLE11 and SLE12 maintenance in last few years, I don't think it's worth the extra work for Factory package with only has few patches which are either permanent or only stay there for relatively short time. Also, with random one-time contributors to Factory package, it would be even more difficult to keep the package cleaned up. The problem is that we have so-called "Factory first" policy. In theory, this should mean no features or bugfixes should be added to SLE packages unless they are also in the respective Factory package (and preferrably also upstream) or at least submitted there. This idea sounds reasonable but the SLE15 review team interprets the policy in rather different way: they want even the contents Factory and SLE15 packages in OBS to look (almost) the same and enforce that by declining submissions that differ from Factory in non-trivial way. For six weeks I tried to appeal to common sense and explain that those two packages only differ in "metadata coding style" and that if SLE and openSUSE packages are maintained by different people, there is no need for one of them to adopt the other's preferences (and that the packages will start to differ soon anyway). They were adamant and in the end, they made it absolutely clear that there is no way the SLE15 submission can be accepted unless I at least submit my cleanup to Factory devel project. They didn't say it has to be accepted, though, so here it is but it's completely up to you if you want it or not. Once again, I'm sorry about dragging you into this, I wanted to avoid it but I ran out of options. Summary of the changes: - patches are regenerated using git - patches are annotated the way we use in kernel packages (the annotations make more sense for upstream backports but we currently don't have any in Factory) - one patch (iproute2-HZ.diff) is split into two - Patch* lines are moved out of the rest of tags for easier orientation - conditionally applied patches are moved to the end of the series - all patches are applied in both specfiles so that both builds use the same source tree OBS-URL: https://build.opensuse.org/request/show/518382 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=144
2017-08-23 23:59:19 +02:00
ip/ipxfrm.c | 2 +-
ip/xfrm_policy.c | 1 +
ip/xfrm_state.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
Accepting request 518382 from home:mkubecek:branches:security:netfilter First of all, I would like to apologize for this submit request, if it was up to me, I would never send it. I strongly believe it's package maintainer's job to decide how a package should be organized, what should the specfile look like, how should patches be named and what format to use etc. That's why I really dislike the idea of pushing package maintainer to accept someone else's preferences. I've been forced to submit it but you shouldn't feel obliged to accept it unless you really like it. Except for some minor differences, this is a cleanup I did for SLE15 iproute2 package submission. In order to effectively maintain the package throughout the SLE15 lifetime (planned to be 13+ years), I'm using a git repository to prepare, handle and track patches and prefer to have them in uniform format with annotations similar to ones we use in openSUSE/SLE kernel packages. While this workflow proved beneficial for SLE11 and SLE12 maintenance in last few years, I don't think it's worth the extra work for Factory package with only has few patches which are either permanent or only stay there for relatively short time. Also, with random one-time contributors to Factory package, it would be even more difficult to keep the package cleaned up. The problem is that we have so-called "Factory first" policy. In theory, this should mean no features or bugfixes should be added to SLE packages unless they are also in the respective Factory package (and preferrably also upstream) or at least submitted there. This idea sounds reasonable but the SLE15 review team interprets the policy in rather different way: they want even the contents Factory and SLE15 packages in OBS to look (almost) the same and enforce that by declining submissions that differ from Factory in non-trivial way. For six weeks I tried to appeal to common sense and explain that those two packages only differ in "metadata coding style" and that if SLE and openSUSE packages are maintained by different people, there is no need for one of them to adopt the other's preferences (and that the packages will start to differ soon anyway). They were adamant and in the end, they made it absolutely clear that there is no way the SLE15 submission can be accepted unless I at least submit my cleanup to Factory devel project. They didn't say it has to be accepted, though, so here it is but it's completely up to you if you want it or not. Once again, I'm sorry about dragging you into this, I wanted to avoid it but I ran out of options. Summary of the changes: - patches are regenerated using git - patches are annotated the way we use in kernel packages (the annotations make more sense for upstream backports but we currently don't have any in Factory) - one patch (iproute2-HZ.diff) is split into two - Patch* lines are moved out of the rest of tags for easier orientation - conditionally applied patches are moved to the end of the series - all patches are applied in both specfiles so that both builds use the same source tree OBS-URL: https://build.opensuse.org/request/show/518382 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=144
2017-08-23 23:59:19 +02:00
diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index d5eb22e25476..b72858d8a210 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -114,7 +114,7 @@ struct typeent {
static const struct typeent xfrmproto_types[] = {
{ "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "comp", IPPROTO_COMP },
{ "route2", IPPROTO_ROUTING }, { "hao", IPPROTO_DSTOPTS },
- { "ipsec-any", IPSEC_PROTO_ANY },
+ { "ipsec-any", IPSEC_PROTO_ANY }, { "ipv6", IPPROTO_IPV6 },
{ NULL, -1 }
};
Accepting request 518382 from home:mkubecek:branches:security:netfilter First of all, I would like to apologize for this submit request, if it was up to me, I would never send it. I strongly believe it's package maintainer's job to decide how a package should be organized, what should the specfile look like, how should patches be named and what format to use etc. That's why I really dislike the idea of pushing package maintainer to accept someone else's preferences. I've been forced to submit it but you shouldn't feel obliged to accept it unless you really like it. Except for some minor differences, this is a cleanup I did for SLE15 iproute2 package submission. In order to effectively maintain the package throughout the SLE15 lifetime (planned to be 13+ years), I'm using a git repository to prepare, handle and track patches and prefer to have them in uniform format with annotations similar to ones we use in openSUSE/SLE kernel packages. While this workflow proved beneficial for SLE11 and SLE12 maintenance in last few years, I don't think it's worth the extra work for Factory package with only has few patches which are either permanent or only stay there for relatively short time. Also, with random one-time contributors to Factory package, it would be even more difficult to keep the package cleaned up. The problem is that we have so-called "Factory first" policy. In theory, this should mean no features or bugfixes should be added to SLE packages unless they are also in the respective Factory package (and preferrably also upstream) or at least submitted there. This idea sounds reasonable but the SLE15 review team interprets the policy in rather different way: they want even the contents Factory and SLE15 packages in OBS to look (almost) the same and enforce that by declining submissions that differ from Factory in non-trivial way. For six weeks I tried to appeal to common sense and explain that those two packages only differ in "metadata coding style" and that if SLE and openSUSE packages are maintained by different people, there is no need for one of them to adopt the other's preferences (and that the packages will start to differ soon anyway). They were adamant and in the end, they made it absolutely clear that there is no way the SLE15 submission can be accepted unless I at least submit my cleanup to Factory devel project. They didn't say it has to be accepted, though, so here it is but it's completely up to you if you want it or not. Once again, I'm sorry about dragging you into this, I wanted to avoid it but I ran out of options. Summary of the changes: - patches are regenerated using git - patches are annotated the way we use in kernel packages (the annotations make more sense for upstream backports but we currently don't have any in Factory) - one patch (iproute2-HZ.diff) is split into two - Patch* lines are moved out of the rest of tags for easier orientation - conditionally applied patches are moved to the end of the series - all patches are applied in both specfiles so that both builds use the same source tree OBS-URL: https://build.opensuse.org/request/show/518382 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=144
2017-08-23 23:59:19 +02:00
diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index de689c4d86c4..6ee2ec6abeba 100644
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c
@@ -93,6 +93,7 @@ static void usage(void)
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP));
+ fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_IPV6));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n");
Accepting request 518382 from home:mkubecek:branches:security:netfilter First of all, I would like to apologize for this submit request, if it was up to me, I would never send it. I strongly believe it's package maintainer's job to decide how a package should be organized, what should the specfile look like, how should patches be named and what format to use etc. That's why I really dislike the idea of pushing package maintainer to accept someone else's preferences. I've been forced to submit it but you shouldn't feel obliged to accept it unless you really like it. Except for some minor differences, this is a cleanup I did for SLE15 iproute2 package submission. In order to effectively maintain the package throughout the SLE15 lifetime (planned to be 13+ years), I'm using a git repository to prepare, handle and track patches and prefer to have them in uniform format with annotations similar to ones we use in openSUSE/SLE kernel packages. While this workflow proved beneficial for SLE11 and SLE12 maintenance in last few years, I don't think it's worth the extra work for Factory package with only has few patches which are either permanent or only stay there for relatively short time. Also, with random one-time contributors to Factory package, it would be even more difficult to keep the package cleaned up. The problem is that we have so-called "Factory first" policy. In theory, this should mean no features or bugfixes should be added to SLE packages unless they are also in the respective Factory package (and preferrably also upstream) or at least submitted there. This idea sounds reasonable but the SLE15 review team interprets the policy in rather different way: they want even the contents Factory and SLE15 packages in OBS to look (almost) the same and enforce that by declining submissions that differ from Factory in non-trivial way. For six weeks I tried to appeal to common sense and explain that those two packages only differ in "metadata coding style" and that if SLE and openSUSE packages are maintained by different people, there is no need for one of them to adopt the other's preferences (and that the packages will start to differ soon anyway). They were adamant and in the end, they made it absolutely clear that there is no way the SLE15 submission can be accepted unless I at least submit my cleanup to Factory devel project. They didn't say it has to be accepted, though, so here it is but it's completely up to you if you want it or not. Once again, I'm sorry about dragging you into this, I wanted to avoid it but I ran out of options. Summary of the changes: - patches are regenerated using git - patches are annotated the way we use in kernel packages (the annotations make more sense for upstream backports but we currently don't have any in Factory) - one patch (iproute2-HZ.diff) is split into two - Patch* lines are moved out of the rest of tags for easier orientation - conditionally applied patches are moved to the end of the series - all patches are applied in both specfiles so that both builds use the same source tree OBS-URL: https://build.opensuse.org/request/show/518382 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=144
2017-08-23 23:59:19 +02:00
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index e11c93bf1c3b..b501e6d04727 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -73,6 +73,7 @@ static void usage(void)
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP));
+ fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_IPV6));
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n");
Accepting request 518382 from home:mkubecek:branches:security:netfilter First of all, I would like to apologize for this submit request, if it was up to me, I would never send it. I strongly believe it's package maintainer's job to decide how a package should be organized, what should the specfile look like, how should patches be named and what format to use etc. That's why I really dislike the idea of pushing package maintainer to accept someone else's preferences. I've been forced to submit it but you shouldn't feel obliged to accept it unless you really like it. Except for some minor differences, this is a cleanup I did for SLE15 iproute2 package submission. In order to effectively maintain the package throughout the SLE15 lifetime (planned to be 13+ years), I'm using a git repository to prepare, handle and track patches and prefer to have them in uniform format with annotations similar to ones we use in openSUSE/SLE kernel packages. While this workflow proved beneficial for SLE11 and SLE12 maintenance in last few years, I don't think it's worth the extra work for Factory package with only has few patches which are either permanent or only stay there for relatively short time. Also, with random one-time contributors to Factory package, it would be even more difficult to keep the package cleaned up. The problem is that we have so-called "Factory first" policy. In theory, this should mean no features or bugfixes should be added to SLE packages unless they are also in the respective Factory package (and preferrably also upstream) or at least submitted there. This idea sounds reasonable but the SLE15 review team interprets the policy in rather different way: they want even the contents Factory and SLE15 packages in OBS to look (almost) the same and enforce that by declining submissions that differ from Factory in non-trivial way. For six weeks I tried to appeal to common sense and explain that those two packages only differ in "metadata coding style" and that if SLE and openSUSE packages are maintained by different people, there is no need for one of them to adopt the other's preferences (and that the packages will start to differ soon anyway). They were adamant and in the end, they made it absolutely clear that there is no way the SLE15 submission can be accepted unless I at least submit my cleanup to Factory devel project. They didn't say it has to be accepted, though, so here it is but it's completely up to you if you want it or not. Once again, I'm sorry about dragging you into this, I wanted to avoid it but I ran out of options. Summary of the changes: - patches are regenerated using git - patches are annotated the way we use in kernel packages (the annotations make more sense for upstream backports but we currently don't have any in Factory) - one patch (iproute2-HZ.diff) is split into two - Patch* lines are moved out of the rest of tags for easier orientation - conditionally applied patches are moved to the end of the series - all patches are applied in both specfiles so that both builds use the same source tree OBS-URL: https://build.opensuse.org/request/show/518382 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=144
2017-08-23 23:59:19 +02:00
--
2.14.1