[PATCH] fix "manpages: do not include v4-only modules in ip6tables manpage"

[PATCH] fix "manpages: do not include v4-only modules in ip6tables manpage"

[Florian Westphal]

previous commit tries to skip v4-only module manpages
by searching for NFPROTO_IPV(4|6) -- in the man page itself.

Searching the .c file instead is not sufficient:
- there is at least one page (libxt_policy) without a libxt_*c
- there are targets/modules which use family AF_UNSPEC.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 extensions/GNUmakefile.in |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 8d7f21d..44a6d02 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -161,10 +161,13 @@ man_run    = \
 	${AM_VERBOSE_GEN} \
 	for ext in $(1); do \
 		f="${srcdir}/libxt_$$ext.man"; \
-		if [ -f "$$f" ] && grep -q "$(3)" "$$f"; then \
-			echo ".SS $$ext"; \
-			cat "$$f"; \
-			continue; \
+		if [ -f "$$f" ] ; then \
+			cfile="${srcdir}/libxt_$$ext.c"; \
+			if [ ! -f "$$cfile" ] || grep -q "\(_UNSPEC\|$(3)\)" "$$cfile"; then \
+				echo ".SS $$ext"; \
+				cat "$$f"; \
+				continue; \
+			fi; \
 		fi; \
 		f="${srcdir}/lib$(2)t_$$ext.man"; \
 		if [ -f "$$f" ]; then \
-- 
1.6.0.6

Re: [PATCH] fix "manpages: do not include v4-only modules in ip6tables manpage"

[Jan Engelhardt]

On Sunday 2009-05-31 18:50, Florian Westphal wrote:

>previous commit tries to skip v4-only module manpages
>by searching for NFPROTO_IPV(4|6) -- in the man page itself.
>
>Searching the .c file instead is not sufficient:
>- there is at least one page (libxt_policy) without a libxt_*c
>- there are targets/modules which use family AF_UNSPEC.

No, this one misses manpages too... Bah, time to eradicate the ip/ip6/
name mess.

>diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
>index 8d7f21d..44a6d02 100644
>--- a/extensions/GNUmakefile.in
>+++ b/extensions/GNUmakefile.in
>@@ -161,10 +161,13 @@ man_run    = \
> 	${AM_VERBOSE_GEN} \
> 	for ext in $(1); do \
> 		f="${srcdir}/libxt_$$ext.man"; \
>-		if [ -f "$$f" ] && grep -q "$(3)" "$$f"; then \
>-			echo ".SS $$ext"; \
>-			cat "$$f"; \
>-			continue; \
>+		if [ -f "$$f" ] ; then \
>+			cfile="${srcdir}/libxt_$$ext.c"; \
>+			if [ ! -f "$$cfile" ] || grep -q "\(_UNSPEC\|$(3)\)" "$$cfile"; then \
>+				echo ".SS $$ext"; \
>+				cat "$$f"; \
>+				continue; \
>+			fi; \
> 		fi; \
> 		f="${srcdir}/lib$(2)t_$$ext.man"; \
> 		if [ -f "$$f" ]; then \

Re: [PATCH] fix "manpages: do not include v4-only modules in ip6tables manpage"

[Pablo Neira Ayuso]

Jan Engelhardt wrote:
> On Sunday 2009-05-31 18:50, Florian Westphal wrote:
> 
>> previous commit tries to skip v4-only module manpages
>> by searching for NFPROTO_IPV(4|6) -- in the man page itself.
>>
>> Searching the .c file instead is not sufficient:
>> - there is at least one page (libxt_policy) without a libxt_*c
>> - there are targets/modules which use family AF_UNSPEC.
> 
> No, this one misses manpages too... Bah, time to eradicate the ip/ip6/
> name mess.

Florian is trying to help fixing this broken feature that you
introduced. Why don't you tell him what pages are missing?

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [PATCH] fix "manpages: do not include v4-only modules in ip6tables manpage"

[Jan Engelhardt]

On Monday 2009-06-01 10:58, Pablo Neira Ayuso wrote:
>Jan Engelhardt wrote:
>> On Sunday 2009-05-31 18:50, Florian Westphal wrote:
>> 
>>> previous commit tries to skip v4-only module manpages
>>> by searching for NFPROTO_IPV(4|6) -- in the man page itself.
>>>
>>> Searching the .c file instead is not sufficient:
>>> - there is at least one page (libxt_policy) without a libxt_*c
>>> - there are targets/modules which use family AF_UNSPEC.
>> 
>> No, this one misses manpages too... Bah, time to eradicate the ip/ip6/
>> name mess.
>
>Florian is trying to help fixing this broken feature that you
>introduced. Why don't you tell him what pages are missing?

Fair enough. The problem is that we have a libxt_poilcy.man file, but
no libxt_policy.c file. After further looking into this, it becomes
apparent that libip6t_policy.c is quite redundant (since struct
ip6t_policy_info is actually xt_policy_info) and should be
incorporated into libipt_policy.c, to be renamed to libxt_policy.c.
Will be sending a pull soon.