[PATCH]Resolve file name conflicts in inn-2.5.3.

Julien ÉLIE julien at trigofacile.com
Thu May 23 19:04:11 UTC 2013


Hi Jochen,

> 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.

Yep, of course.

Here are a few suggestions that you may or may not take into account
for your own inn-2.5.3 rawhide build.  They are needed for upstream,
but not necessarily for your build.



> --- 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
> @@ -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 $? > $@

I will also rename radius.conf.pod to inn-radius.conf.pod for clarity
in the sources (for upstream).

+../man/inn-radius.conf.5: inn-radius.conf.pod	; $(POD2MAN) -s 5 $? > $@



> --- 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>.

No, this occurrence must not be changed.  It is the changelog of a previous
release of INN.

For the INN 2.5.4 release, there will be the following text added, but
I believe it is not necessary for your inn-2.5.3 rawhide build:

--- doc/pod/news.pod	(révision 9475)
+++ doc/pod/news.pod	(copie de travail)
@@ -123,6 +123,13 @@
 
+=item *
+
+As the name of the F<radius.conf> configuration file shipped with INN
+for the B<nnrpd> authenticator against a RADIUS server conflicts with
+the libradius package, this file is renamed to F<inn-radius.conf>
+(B<innupgrade> takes care of the rename during the update).



> --- 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
>   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

Note that there is a typo here because it is radius(8) and not radius(1).
I will commit the change at the same time.



> --- 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
> @@ -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)

Alphabetically:

+inn-radius.conf(5), nnrpd(8), readers.conf(5)



> --- 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

As the name of the sample file is also renamed in the upstream patch,
other changes are needed:

@@ -69,7 +69,7 @@
 	nnrpd.py \
 	nnrpd_auth.pl nnrpd_access.pl nocem.ctl \
         news2mail.cf readers.conf \
-	radius.conf nnrpd_auth.py nnrpd_access.py nnrpd_dynamic.py \
+	inn-radius.conf nnrpd_auth.py nnrpd_access.py nnrpd_dynamic.py \
 	ovdb.conf active.minimal \
 	newsgroups.minimal send-uucp.cf subscriptions
 
@@ -181,7 +181,7 @@
 $D$(PATH_INNDHOSTS):	incoming.conf	; $(COPY_RPRI) $? $@
 $D$(PATH_NEWSFEEDS):	newsfeeds	; $(COPY_RPUB) $? $@
 $D$(PATH_READERSCONF):	readers.conf	; $(COPY_RPUB) $? $@
-$D$(PATH_RADIUS_CONF):	radius.conf	; $(COPY_RPRI) $? $@
+$D$(PATH_RADIUS_CONF):	inn-radius.conf	; $(COPY_RPRI) $? $@
 $D$(PATH_NNRPDTRACK):	nnrpd.track	; $(COPY_RPUB) $? $@
 $D$(PATH_CONTROLCTL):	control.ctl	; $(COPY_RPUB) $? $@
 $D$(PATH_CONTROLCTLLOCAL): control.ctl.local	; $(COPY_RPUB) $? $@
@@ -279,7 +279,7 @@
 parsecontrol:	../samples/parsecontrol		; $(COPY) $? $@
 passwd.nntp:	../samples/passwd.nntp		; $(COPY) $? $@
 readers.conf:	../samples/readers.conf		; $(COPY) $? $@
-radius.conf:	../samples/radius.conf		; $(COPY) $? $@
+inn-radius.conf: ../samples/inn-radius.conf	; $(COPY) $? $@
 startup_innd.pl: ../samples/startup_innd.pl	; $(COPY) $? $@
 send-uucp.cf:	../samples/send-uucp.cf		; $(COPY) $? $@
 subscriptions:	../samples/subscriptions	; $(COPY) $? $@




You also need to patch innupgrade:

--- scripts/innupgrade.in	(révision 9475)
+++ scripts/innupgrade.in	(copie de travail)
@@ -68,7 +68,8 @@
            'filter.tcl'       => 'filter.tcl.OLD',
            'startup.tcl'      => 'startup.tcl.OLD',
 
-           'motd.news'        => 'motd.nnrpd'        # Rename in INN 2.5.3.
+           'motd.news'        => 'motd.nnrpd',       # Rename in INN 2.5.3.
+           'radius.conf'      => 'inn-radius.conf'   # Rename in INN 2.5.4.
           );
 
 # Clean up inn.conf for the new parser in INN 2.4.  Null keys (keys without




and the MANIFEST:

--- MANIFEST	(révision 9475)
+++ MANIFEST	(copie de travail)
@@ -153,6 +153,7 @@
 doc/man/ident.8                       Manpage for ident resolver
 doc/man/incoming.conf.5               Manpage for incoming.conf config file
 doc/man/inews.1                       Manpage for inews frontend
+doc/man/inn-radius.conf.5             Manpage for inn-radius.conf config file
 doc/man/inn.conf.5                    Manpage for inn.conf config file
 doc/man/innbind.8                     Manpage for innbind
 doc/man/inncheck.8                    Manpage for inncheck utility
@@ -206,7 +207,6 @@
 doc/man/pullnews.1                    Manpage for pullnews
 doc/man/qio.3                         Manpage for fast I/O file routines
 doc/man/radius.8                      Manpage for radius authenticator
-doc/man/radius.conf.5                 Manpage for radius.conf config file
 doc/man/rc.news.8                     Manpage for rc.news
 doc/man/readers.conf.5                Manpage for readers.conf config file
 doc/man/rnews.1                       Manpage for rnews frontend
@@ -265,6 +265,7 @@
 doc/pod/ident.pod                     Master file for ident.8
 doc/pod/incoming.conf.pod             Master file for incoming.conf.5
 doc/pod/inews.pod                     Master file for inews.1
+doc/pod/inn-radius.conf.pod           Master file for inn-radius.conf.5
 doc/pod/inn.conf.pod                  Master file for inn.conf.5
 doc/pod/innbind.pod                   Master file for innbind.8
 doc/pod/inncheck.pod                  Master file for inncheck.8
@@ -307,7 +308,6 @@
 doc/pod/prunehistory.pod              Master file for prunehistory.8
 doc/pod/pullnews.pod                  Master file for pullnews.1
 doc/pod/qio.pod                       Master file for qio.3
-doc/pod/radius.conf.pod               Master file for radius.conf.5
 doc/pod/radius.pod                    Master file for radius.8
 doc/pod/rc.news.pod                   Master file for rc.news.8
 doc/pod/readers.conf.pod              Master file for readers.conf.5
@@ -628,6 +628,7 @@
 samples/filter_innd.py                Sample Python filter for innd
 samples/filter_nnrpd.pl               Sample Perl filter for nnrpd
 samples/incoming.conf                 Permissions for incoming feeds
+samples/inn-radius.conf               Sample config for RADIUS authentication
 samples/inn.conf.in                   General INN configuration
 samples/innfeed.conf                  Outgoing feed configuration
 samples/innreport.conf.in             Log summary configuration
@@ -659,7 +660,6 @@
 samples/nocem.ctl                     Config file for perl-nocem
 samples/ovdb.conf                     Berkeley DB overview configuration
 samples/passwd.nntp                   Passwords for remote connections
-samples/radius.conf                   Sample config for RADIUS authentication
 samples/readers.conf                  Reader connection configuration
 samples/send-uucp.cf                  send-uucp configuration file
 samples/startup_innd.pl               Perl startup code for innd


--- support/mkmanifest	(révision 9475)
+++ support/mkmanifest	(copie de travail)
@@ -215,6 +215,7 @@
 site/filter_innd.py
 site/filter_nnrpd.pl
 site/incoming.conf
+site/inn-radius.conf
 site/inn.conf
 site/innfeed.conf
 site/innreport.conf
@@ -241,7 +242,6 @@
 site/nocem.ctl
 site/ovdb.conf
 site/passwd.nntp
-site/radius.conf
 site/readers.conf
 site/send-uucp.cf
 site/startup_innd.pl




That's all!

-- 
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)


More information about the inn-workers mailing list