Send inn-workers mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-workers
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-workers digest..."
Today's Topics:
1. Re: Odd issue with pod2man when building on Fedora build
server (Jochen Schmitt)
2. [PATCH]Resolve file name conflicts in inn-2.5.3. (Jochen Schmitt)
3. Re: Odd issue with pod2man when building on Fedora build
server (Julien ?LIE)
4. Re: Odd issue with pod2man when building on Fedora build
server (Russ Allbery)
5. Re: [PATCH]Resolve file name conflicts in inn-2.5.3. (Julien ?LIE)
6. Re: [PATCH]Resolve file name conflicts in inn-2.5.3.
(Russ Allbery)
7. Re: [PATCH]Resolve file name conflicts in inn-2.5.3. (Julien ?LIE)
----------------------------------------------------------------------
Message: 1
Date: Wed, 22 May 2013 19:35:48 +0200
From: Jochen Schmitt <[email protected]>
To: Julien ?LIE <[email protected]>
Cc: [email protected]
Subject: Re: Odd issue with pod2man when building on Fedora build
server
Message-ID: <[email protected]>
Content-Type: text/plain; charset=iso-8859-1
On Tue, May 21, 2013 at 09:04:49PM +0200, Julien ?LIE wrote:
>
> It looks like recent POD versions do not cope with "=item 0" followed
> by "=item 1":
> http://www.nntp.perl.org/group/perl.perl5.porters/2013/02/msg199266.html
Hallo Julien,
thank you for your quick response. I have created an patch
which solved the issue. I have attached this patch to this
mail for review and upstream integration.
Best Regards:
Jochen Schmitt
diff -up inn-2.5.3/control/pgpverify.in.pdx inn-2.5.3/control/pgpverify.in
--- inn-2.5.3/control/pgpverify.in.pdx 2013-05-22 18:45:57.132464138 +0200
+++ inn-2.5.3/control/pgpverify.in 2013-05-22 18:47:39.056806362 +0200
@@ -738,19 +738,19 @@ B<pgpverify> may exit with the following
The control message had a good PGP signature.
-=item 1
+=item Z<>1
The control message had no PGP signature.
-=item 2
+=item Z<>2
The control message had an unknown PGP signature.
-=item 3
+=item Z<>3
The control message had a bad PGP signature.
-=item 255
+=item Z<>255
A problem occurred not directly related to PGP analysis of signature.
diff -up inn-2.5.3/doc/pod/actsync.pod.pdx inn-2.5.3/doc/pod/actsync.pod
--- inn-2.5.3/doc/pod/actsync.pod.pdx 2013-05-22 18:42:30.275978028 +0200
+++ inn-2.5.3/doc/pod/actsync.pod 2013-05-22 18:42:30.281977635 +0200
@@ -529,20 +529,20 @@ level as follows:
No debug or status reports (default).
-=item 1
+=item Z<>1
Print summary, but only if work was needed or done.
-=item 2
+=item Z<>2
Print actions, exec output, and summary, but only if work was needed or
done.
-=item 3
+=item Z<>3
Print actions, exec output, and summary.
-=item 4
+=item Z<>4
Full debug output.
------------------------------
Message: 2
Date: Wed, 22 May 2013 19:43:21 +0200
From: Jochen Schmitt <[email protected]>
To: [email protected]
Subject: [PATCH]Resolve file name conflicts in inn-2.5.3.
Message-ID: <[email protected]>
Content-Type: text/plain; charset=us-ascii
Hello,
several weeks ago, I have reported an issue that inn-2.5.3, that this
package contains files with names conlicting with the libradius package.
Therefore, I have created the following patch. It may be nice, if you
can take a review of the patch and integrating the patch into the
upstream sources.
Best Regards:
Jochen Schmitt
diff -up inn-2.5.3/doc/man/Makefile.radius inn-2.5.3/doc/man/Makefile
--- inn-2.5.3/doc/man/Makefile.radius 2013-02-24 16:27:53.340492703 +0100
+++ inn-2.5.3/doc/man/Makefile 2013-02-24 16:27:53.353491839 +0100
@@ -18,7 +18,7 @@ SEC5 = active.5 active.times.5 buffindex
cycbuff.conf.5 distrib.pats.5 distributions.5 expire.ctl.5 history.5
incoming.conf.5 \
inn.conf.5 innfeed.conf.5 innwatch.ctl.5 moderators.5 motd.news.5 \
newsfeeds.5 newsgroups.5 newslog.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
- passwd.nntp.5 radius.conf.5 readers.conf.5 \
+ passwd.nntp.5 inn-radius.conf.5 readers.conf.5 \
storage.conf.5 subscriptions.5
SEC8 = actsync.8 archive.8 batcher.8 buffchan.8 ckpasswd.8 \
diff -up inn-2.5.3/doc/pod/Makefile.radius inn-2.5.3/doc/pod/Makefile
--- inn-2.5.3/doc/pod/Makefile.radius 2013-02-24 16:27:53.370490710 +0100
+++ inn-2.5.3/doc/pod/Makefile 2013-02-24 16:27:53.382489913 +0100
@@ -25,7 +25,7 @@ MAN5 = ../man/active.5 ../man/active.tim
../man/inn.conf.5 ../man/innfeed.conf.5 ../man/moderators.5 \
../man/motd.news.5 ../man/newsfeeds.5 ../man/newsgroups.5 \
../man/newslog.5 ../man/nntpsend.ctl.5 ../man/ovdb.5 \
- ../man/passwd.nntp.5 ../man/radius.conf.5 ../man/readers.conf.5 \
+ ../man/passwd.nntp.5 ../man/inn-radius.conf.5 ../man/readers.conf.5 \
../man/storage.conf.5 ../man/subscriptions.5
MAN8 = ../man/actsync.8 ../man/archive.8 ../man/auth_krb5.8 \
@@ -106,7 +106,7 @@ maintclean: distclean
../man/nntpsend.ctl.5: nntpsend.ctl.pod ; $(POD2MAN) -s 5 $? > $@
../man/ovdb.5: ovdb.pod ; $(POD2MAN) -s 5 $? > $@
../man/passwd.nntp.5: passwd.nntp.pod ; $(POD2MAN) -s 5 $? > $@
-../man/radius.conf.5: radius.conf.pod ; $(POD2MAN) -s 5 $? > $@
+../man/inn-radius.conf.5: radius.conf.pod ; $(POD2MAN) -s 5 $? >
$@
../man/readers.conf.5: readers.conf.pod ; $(POD2MAN) -s 5 $? > $@
../man/storage.conf.5: storage.conf.pod ; $(POD2MAN) -s 5 $? > $@
../man/subscriptions.5: subscriptions.pod ; $(POD2MAN) -s 5 $? >
$@
diff -up inn-2.5.3/doc/pod/news.pod.radius inn-2.5.3/doc/pod/news.pod
--- inn-2.5.3/doc/pod/news.pod.radius 2013-02-24 16:27:53.368490843 +0100
+++ inn-2.5.3/doc/pod/news.pod 2013-02-24 16:27:53.367490909 +0100
@@ -1459,7 +1459,7 @@ detailed documentation has also been wri
=item *
The RADIUS configuration is now wrapped in a C<server {}> block in
-F<radius.conf>.
+F<inn-radius.conf>.
=item *
diff -up inn-2.5.3/doc/pod/radius.conf.pod.radius
inn-2.5.3/doc/pod/radius.conf.pod
--- inn-2.5.3/doc/pod/radius.conf.pod.radius 2013-02-24 16:27:53.372490577
+0100
+++ inn-2.5.3/doc/pod/radius.conf.pod 2013-02-24 16:27:53.372490577 +0100
@@ -1,13 +1,13 @@
=head1 NAME
-radius.conf - Configuration for nnrpd RADIUS authenticator
+inn-radius.conf - Configuration for nnrpd RADIUS authenticator
=head1 DESCRIPTION
This describes the format and attributes of the configuration file for the
nnrpd RADIUS authenticator. See radius(1) for more information about the
authenticator program. The default location for this file is
-F<radius.conf> in I<pathetc>.
+F<inn-radius.conf> in I<pathetc>.
Blank lines and lines beginning with C<#> are ignored, as is anything
after a C<#> on a line. All other lines should begin with a parameter
@@ -98,7 +98,7 @@ The shared secret with the RADIUS server
=head1 HISTORY
This documentation was written by Russ Allbery <[email protected]> based on
-the comments in the sample F<radius.conf> file by Yury S<B. Razbegin>.
+the comments in the sample F<inn-radius.conf> file by Yury S<B. Razbegin>.
$Id: radius.conf.pod 8200 2008-11-30 13:31:30Z iulius $
diff -up inn-2.5.3/doc/pod/radius.pod.radius inn-2.5.3/doc/pod/radius.pod
--- inn-2.5.3/doc/pod/radius.pod.radius 2013-02-24 16:27:53.386489647 +0100
+++ inn-2.5.3/doc/pod/radius.pod 2013-02-24 16:27:53.383489846 +0100
@@ -16,9 +16,9 @@ authenticator. It is useful for a site
authentication via RADIUS and wants to authenticate news reading
connections as well.
-By default, B<radius> reads I<pathetc>/radius.conf for configuration
+By default, B<radius> reads I<pathetc>/inn-radius.conf for configuration
information, but a different configuration file can be specified with
-B<-f>. See radius.conf(5) for a description of the configuration file.
+B<-f>. See inn-radius.conf(5) for a description of the configuration file.
=head1 OPTIONS
@@ -26,7 +26,7 @@ B<-f>. See radius.conf(5) for a descrip
=item B<-f> I<config>
-Read I<config> instead of I<pathetc>/radius.conf for configuration
+Read I<config> instead of I<pathetc>/inn-radius.conf for configuration
information.
=item B<-h>
@@ -70,7 +70,7 @@ $Id: radius.pod 7664 2007-09-02 12:58:07
=head1 SEE ALSO
-nnrpd(8), radius.conf(5), readers.conf(5)
+nnrpd(8), inn-radius.conf(5), readers.conf(5)
S<RFC 2865>, Remote Authentication Dial In User Service.
diff -up inn-2.5.3/include/inn/paths.h.in.radius
inn-2.5.3/include/inn/paths.h.in
--- inn-2.5.3/include/inn/paths.h.in.radius 2013-02-24 16:27:53.201501936
+0100
+++ inn-2.5.3/include/inn/paths.h.in 2013-02-24 16:27:53.203501803 +0100
@@ -68,7 +68,7 @@
#define INN_PATH_MOTD_INND "motd.innd"
#define INN_PATH_MOTD_NNRPD "motd.nnrpd"
#define INN_PATH_STORAGECTL "storage.conf"
-#define INN_PATH_RADIUS_CONFIG "radius.conf"
+#define INN_PATH_RADIUS_CONFIG "inn-radius.conf"
#define INN_PATH_FILESYSTEMS "filesystems"
/* Default prefix path is pathspool. */
diff -up inn-2.5.3/site/Makefile.radius inn-2.5.3/site/Makefile
--- inn-2.5.3/site/Makefile.radius 2013-02-24 16:27:53.222500541 +0100
+++ inn-2.5.3/site/Makefile 2013-02-24 16:32:10.549406807 +0100
@@ -46,7 +46,7 @@ PATH_STORAGECONF = ${PATHETC}/storage.co
PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf
PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf
PATH_BUFFINDEXED = ${PATHETC}/buffindexed.conf
-PATH_RADIUS_CONF = ${PATHETC}/radius.conf
+PATH_RADIUS_CONF = ${PATHETC}/inn-radius.conf
PATH_OVDB_CONF = ${PATHETC}/ovdb.conf
PATH_SENDUUCP_CF = ${PATHETC}/send-uucp.cf
PATH_SUBSCRIPTIONS = ${PATHETC}/subscriptions
------------------------------
Message: 3
Date: Wed, 22 May 2013 19:48:21 +0200
From: Julien ?LIE <[email protected]>
To: [email protected]
Cc: Jochen Schmitt <[email protected]>
Subject: Re: Odd issue with pod2man when building on Fedora build
server
Message-ID: <[email protected]>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Hi Jochen,
> thank you for your quick response. I have created an patch
> which solved the issue. I have attached this patch to this
> mail for review and upstream integration.
Thanks for having had a look at it.
> +++ inn-2.5.3/control/pgpverify.in 2013-05-22 18:47:39.056806362 +0200
>
> -=item 1
> +=item Z<>1
I see that the man page of pgpverify currently uses
=item 0Z<>
Isn't it enough to fix the problem? Should all the items be changed
similarly?
> +++ inn-2.5.3/doc/pod/actsync.pod 2013-05-22 18:42:30.281977635 +0200
> @@ -529,20 +529,20 @@ level as follows:
>
> -=item 1
> +=item Z<>1
Does it also work with:
=item Z<>1
(and same thing for all the items)
Russ suggested this change yesterday for actsync.pod:
http://inn.eyrie.org/trac/changeset/9474/trunk
--
Julien ?LIE
? Dieu a dit : il faut partager. Les riches auront la nourriture, les
pauvres de l'app?tit. ? (Coluche)
------------------------------
Message: 4
Date: Wed, 22 May 2013 10:56:01 -0700
From: Russ Allbery <[email protected]>
To: [email protected]
Subject: Re: Odd issue with pod2man when building on Fedora build
server
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Julien ?LIE <[email protected]> writes:
> Hi Jochen,
>> thank you for your quick response. I have created an patch
>> which solved the issue. I have attached this patch to this
>> mail for review and upstream integration.
> Thanks for having had a look at it.
>> +++ inn-2.5.3/control/pgpverify.in 2013-05-22 18:47:39.056806362 +0200
>>
>> -=item 1
>> +=item Z<>1
> I see that the man page of pgpverify currently uses
> =item 0Z<>
> Isn't it enough to fix the problem? Should all the items be changed
> similarly?
Sorry, yeah, I committed a change yesterday that should fix this problem.
I forced all of the =item tags to descriptions. pod2man wouldn't warn
about the first one since it would take that as the sign that this was a
numeric list, but some POD translators might mangle it into "1." because
they do automatic renumbering.
> Does it also work with:
> =item Z<>1
> (and same thing for all the items)
It shouldn't matter where the Z<> is put as long as it's there somewhere.
Putting C<> around the number would also work, although that also changes
the formatting.
--
Russ Allbery ([email protected]) <http://www.eyrie.org/~eagle/>
Please send questions to the list rather than mailing me directly.
<http://www.eyrie.org/~eagle/faqs/questions.html> explains why.
------------------------------
Message: 5
Date: Wed, 22 May 2013 19:56:29 +0200
From: Julien ?LIE <[email protected]>
To: [email protected]
Cc: Jochen Schmitt <[email protected]>
Subject: Re: [PATCH]Resolve file name conflicts in inn-2.5.3.
Message-ID: <[email protected]>
Content-Type: text/plain; charset=ISO-8859-1
Hi Jochen,
> several weeks ago, I have reported an issue that inn-2.5.3, that this
> package contains files with names conlicting with the libradius package.
>
> Therefore, I have created the following patch. It may be nice, if you
> can take a review of the patch and integrating the patch into the
> upstream sources.
[...]
> -By default, B<radius> reads I<pathetc>/radius.conf for configuration
> +By default, B<radius> reads I<pathetc>/inn-radius.conf for configuration
Hmm... It means that the configuration name changed, and we then need
taking care of that during "innupgrade".
I wonder whether this change is necessary. Couldn't only the name
of the man page be changed?
According to:
https://fedoraproject.org/wiki/Packaging:Conflicts#Man_Page_Name_Conflicts
we could just rename man5/radius.conf.5.gz to man5/radius.conf.5inn.gz;
wouldn't it be enough?
--
Julien ?LIE
? Dieu a dit : il faut partager. Les riches auront la nourriture, les
pauvres de l'app?tit. ? (Coluche)
------------------------------
Message: 6
Date: Wed, 22 May 2013 10:58:58 -0700
From: Russ Allbery <[email protected]>
To: [email protected]
Subject: Re: [PATCH]Resolve file name conflicts in inn-2.5.3.
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Julien ?LIE <[email protected]> writes:
> Hmm... It means that the configuration name changed, and we then need
> taking care of that during "innupgrade".
> I wonder whether this change is necessary. Couldn't only the name of
> the man page be changed?
> According to:
> https://fedoraproject.org/wiki/Packaging:Conflicts#Man_Page_Name_Conflicts
> we could just rename man5/radius.conf.5.gz to man5/radius.conf.5inn.gz;
> wouldn't it be enough?
It would probably be better to change the configuration file as well,
since otherwise it's hard for the user to specify which man page they want
to see. That avoids the file conflict, but there's still a conceptual
conflict; it pushes the burden to the user.
I suspect there aren't that many people using the radius authenticator and
renaming the configuration file wouldn't have that much impact. But yes,
we would want to rename it during innupgrade as well.
--
Russ Allbery ([email protected]) <http://www.eyrie.org/~eagle/>
Please send questions to the list rather than mailing me directly.
<http://www.eyrie.org/~eagle/faqs/questions.html> explains why.
------------------------------
Message: 7
Date: Wed, 22 May 2013 21:07:30 +0200
From: Julien ?LIE <[email protected]>
To: [email protected]
Subject: Re: [PATCH]Resolve file name conflicts in inn-2.5.3.
Message-ID: <[email protected]>
Content-Type: text/plain; charset=UTF-8; format=flowed
Hi Russ,
> It would probably be better to change the configuration file as well,
> since otherwise it's hard for the user to specify which man page they want
> to see. That avoids the file conflict, but there's still a conceptual
> conflict; it pushes the burden to the user.
Shouldn't we then also rename radius(8) to inn-radius(8)?
I also wonder if names like history(5), inews(1), ident(8), domain(8) or
expire(8) would not suffer from the same problem... They probably are
not specific to INN...
--
Julien ?LIE
? ? Ne me dis pas que c'est cette poign?e de Gaulois d'en face qui
vous a mis dans cet ?tat !
? Il est vrai que j'ai ?t? frapp? moi-m?me par la force
persuasive de cette poign?e, amiral ! ? (Ast?rix)
------------------------------
_______________________________________________
inn-workers mailing list
[email protected]
https://lists.isc.org/mailman/listinfo/inn-workers
End of inn-workers Digest, Vol 51, Issue 3
******************************************
