forked from pool/iproute2
Jan Engelhardt
067408d5f9
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
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From: Michal Kubecek <mkubecek@suse.cz>
|
||
Date: Mon, 19 Oct 2015 14:11:00 +0200
|
||
Subject: man: fix documentation references in manual pages
|
||
Patch-mainline: Never, SUSE specific
|
||
References: bsc#949063
|
||
|
||
Some manual pages refer to Debian specific paths and package names.
|
||
Replace them by SUSE specific ones.
|
||
---
|
||
man/man8/lnstat.8 | 2 +-
|
||
man/man8/ss.8 | 4 ++--
|
||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
||
diff --git a/man/man8/lnstat.8 b/man/man8/lnstat.8
|
||
index acd5f4a20522..738acd545f6a 100644
|
||
--- a/man/man8/lnstat.8
|
||
+++ b/man/man8/lnstat.8
|
||
@@ -255,7 +255,7 @@ route cache removal, therefore always zero.
|
||
|
||
.SH SEE ALSO
|
||
.BR ip (8),
|
||
-and /usr/share/doc/iproute-doc/README.lnstat (package iproute-doc on Debian)
|
||
+and /usr/share/doc/packages/iproute2/README.lnstat
|
||
.br
|
||
.SH AUTHOR
|
||
lnstat was written by Harald Welte <laforge@gnumonks.org>.
|
||
diff --git a/man/man8/ss.8 b/man/man8/ss.8
|
||
index 81de69de8042..092570884cf6 100644
|
||
--- a/man/man8/ss.8
|
||
+++ b/man/man8/ss.8
|
||
@@ -142,7 +142,7 @@ Read filter information from FILE.
|
||
Each line of FILE is interpreted like single command line option. If FILE is - stdin is used.
|
||
.TP
|
||
.B FILTER := [ state STATE-FILTER ] [ EXPRESSION ]
|
||
-Please take a look at the official documentation (Debian package iproute-doc) for details regarding filters.
|
||
+Please take a look at the official documentation (package iproute2-doc) for details regarding filters.
|
||
|
||
.SH STATE-FILTER
|
||
|
||
@@ -197,7 +197,7 @@ Find all local processes connected to X server.
|
||
List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers.
|
||
.SH SEE ALSO
|
||
.BR ip (8),
|
||
-.BR /usr/share/doc/iproute-doc/ss.html " (package iproutedoc)",
|
||
+.BR /usr/share/doc/packages/iproute2/ss.* " (package iproute2-doc)"
|
||
.br
|
||
.BR RFC " 793 "
|
||
- https://tools.ietf.org/rfc/rfc793.txt (TCP states)
|
||
--
|
||
2.14.1
|
||
|