Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2013-04-07 Thread Adam D. Barratt
Hi,

I was looking at the inn2 upload for an unblock, but...

On Wed, 2012-11-28 at 10:08 +, Nick Leverton wrote:
 Herewith the debdiff in the hope it makes reviewing easier - meant to
 append it previously, sorry.

+dpkg-maintscript-helper rm_conffile /etc/news/motd.news 2.5.3-1~ package -- 
$@

That (and the other similar calls) is wrong. From
dpkg-maintscript-helper(1):

_package_ is the package name. If empty or omitted, the
DPKG_MAINTSCRIPT_PACKAGE environment variable (as set by dpkg) will be
used.


Regards,

Adam


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2013-02-03 Thread Julien ÉLIE

Hi Russ,


Couldn't we install them as ${PATHETC}/motd.innd.sample and
${PATHETC}/motd.nnrpd.sample or should they be in a separate path?
In the latter case, would the ${PATHETC}/samples directory be fine?


Looking at the files, they're mostly documentation for the facility.  I'm
wondering whether that's a useful thing to install.  The upside of
installing some sort of sample is that it makes it clear to people
installing a new server that this is something that can be done.  The
downside is that the files are not, themselves, actually useful; you
wouldn't use any part of their content when creating a real MOTD file.
They're just documentation.


Shouldn't we just add examples in /etc/news/motd.innd.sample and 
/etc/news/motd.nnrpd/sample so that these files contain more information 
than mere documentation?
Wouldn't then /etc/news be the right place to keep using?  (Note that we 
keep .sample at the end of the name of these files for them not to be 
automatically used by INN in case the news administrator forgot to 
modify them.)



For instance adding in motd.nnrpd.sample:

%%%
Here are a few suggestions of messages to display to the news reader.

Example 1
-

Attention all users,

This server will be down for scheduled upgrades on February 1st.
It should be back up by 8:00 a.m. February 2nd.
Any questions should be e-mailed to newsmas...@example.com.

Apologies for the disturbance.


Example 2
-

Dear customers,

We are pleased to announce the creation of a support newsgroup, named 
our.company.support.  It was created on February 1st and is intended 
to receive your questions about the use of our services.  Our support 
team will respond within a couple of days.


Please use this new newsgroup preferably as a means to contact us.


Example 3
-

This news server now supports TLS connections.  Please configure your 
news reader to use TLS when connecting or authenticating.  A tutorial is 
available in the newsgroup our.company.support to help you do the 
change.  Do not hesitate to ask for help in the newsgroup if you 
encounter issues during the change.


Starting from February 1st, unencrypted authentications (that is to say 
not using TLS) will be rejected.



Example 4
-

Support for a new SASL mechanism has been added:  OPENID20 can now be 
used to authenticate.  Feel free to use it!

%%%




And in motd.innd.sample:

%%%
Here are a few suggestions of messages to display to the peer.

Example 1
-

Attention all users,

This server will be down for scheduled upgrades on February 1st.
It should be back up by 8:00 a.m. February 2nd.
Any questions should be e-mailed to newsmas...@example.com.

Apologies for the disturbance.


Example 2
-

This news server now carries the comp.* hierarchy.  Feel free to add it 
to the list of hierarchies you feed us.



Example 3
-

This news server no longer accepts articles whose length exceeds 32 768 
bytes.  Please configure your server not to send us such articles.



Example 4
-

Starting from February 1st, the IP of this news server will change. 
Note that its host name remains the same.  In case explicit rules based 
on IP exist at your end (firewall, iptables, feed configuration, etc.), 
please update them to use 10.0.0.1 as the IP of our news server.

%%%



Is it OK to do the suggested change and keep the samples in /etc/news?

Please tell me in case there are misspellings in the suggested texts.
Some of you may have noticed that the first example for nnrpd is taken 
from RFC 6048 (specifying LIST MOTD, amongst other commands).  I hope it 
is fine to use it :-)


If you have ideas of other examples to add, do not hesitate to suggest.

--
Julien ÉLIE

« Il faut mettre un frein à l'immobilisme. »


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-28 Thread Nick Leverton
tag 690128 +patch
thanks

On Tue, Nov 27, 2012 at 10:42:37PM -0800, Russ Allbery wrote:
 Marco, do you want to handle this update?  I'm happy to help here, but
 don't want to tromp on you if you'd rather take care of it.

Herewith the debdiff in the hope it makes reviewing easier - meant to
append it previously, sorry.

Nick
diff -Nru inn2-2.5.3/debian/changelog inn2-2.5.3/debian/changelog
--- inn2-2.5.3/debian/changelog 2012-06-29 01:03:17.0 +0100
+++ inn2-2.5.3/debian/changelog 2012-11-27 11:49:54.0 +
@@ -1,3 +1,12 @@
+inn2 (2.5.3-1.1) squeeze-backports; urgency=low
+
+  * Non-maintainer upload.
+  * Handle upstream renaming of our conffile /etc/news/motd.news to
+non-conffile /etc/news/motd.nnrpd.  If it's never been amended by
+the admin, then just remove it. (Closes: #690128)
+
+ -- Nick Leverton n...@leverton.org  Tue, 27 Nov 2012 11:43:37 +
+
 inn2 (2.5.3-1) unstable; urgency=low
 
   * New upstream release. Fixes:
diff -Nru inn2-2.5.3/debian/inn2.postinst inn2-2.5.3/debian/inn2.postinst
--- inn2-2.5.3/debian/inn2.postinst 2012-06-28 16:49:56.0 +0100
+++ inn2-2.5.3/debian/inn2.postinst 2012-11-27 15:35:25.0 +
@@ -155,6 +155,18 @@
 fi
 }
 
+# #690128: if the old MOTD file has been amended by the admin from default,
+# then copy it to the new non-conffile nnrpd MOTD file.
+# If not then remove the old MOTD conffile, being sure to cater for rollback.
+if [ $1 = configure ]  [ -n $2 ] 
+   dpkg --compare-versions $2 le-nl 2.5.3-1~; then
+   if [ -e /etc/news/motd.news.dpkg-backup -a ! -e /etc/news/motd.nnrpd ]; 
then
+   echo Moving obsolete conffile /etc/news/motd.news modified by you 
to /etc/news/motd.nnrpd
+   mv /etc/news/motd.news.dpkg-backup /etc/news/motd.nnrpd
+   fi
+fi
+dpkg-maintscript-helper rm_conffile /etc/news/motd.news 2.5.3-1~ package -- 
$@
+
 case $1 in
 configure)
 init_inn_files
diff -Nru inn2-2.5.3/debian/inn2.postrm inn2-2.5.3/debian/inn2.postrm
--- inn2-2.5.3/debian/inn2.postrm   2011-04-13 23:26:37.0 +0100
+++ inn2-2.5.3/debian/inn2.postrm   2012-11-27 15:35:30.0 +
@@ -1,5 +1,10 @@
 #!/bin/sh -e
 
+# #690128: if the old MOTD file has been amended by the admin from default,
+# then rename it to the new non-conffile nnrpd MOTD file.
+# If not then remove the old MOTD conffile, being sure to cater for rollback.
+dpkg-maintscript-helper rm_conffile /etc/news/motd.news 2.5.3-1~ package -- 
$@
+
 if [ $1 = purge ]; then
   update-rc.d inn2 remove /dev/null
   if [ -e /var/lib/news/ ]; then
diff -Nru inn2-2.5.3/debian/inn2.preinst inn2-2.5.3/debian/inn2.preinst
--- inn2-2.5.3/debian/inn2.preinst  2011-04-13 23:26:37.0 +0100
+++ inn2-2.5.3/debian/inn2.preinst  2012-11-27 15:35:30.0 +
@@ -1,5 +1,10 @@
 #!/bin/sh -e
 
+# #690128: if the old MOTD file has been amended by the admin from default,
+# then copy it to the new non-conffile nnrpd MOTD file.
+# If not then remove the old MOTD conffile, being sure to cater for rollback.
+dpkg-maintscript-helper rm_conffile /etc/news/motd.news 2.5.3-1~ -- $@
+
 upgrade_quirks() {
   # $2 is non-empty when installing from the config-files state
   [ $2 ] || return 0
diff -Nru inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch 
inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch
--- inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch   
1970-01-01 01:00:00.0 +0100
+++ inn2-2.5.3/debian/patches/debian-handle-motd-on-upgrade.patch   
2012-11-24 19:50:55.0 +
@@ -0,0 +1,14 @@
+Index: inn2-2.5.3/scripts/innupgrade.in
+===
+--- inn2-2.5.3.orig/scripts/innupgrade.in  2012-06-15 19:25:36.0 
+0100
 inn2-2.5.3/scripts/innupgrade.in   2012-11-24 19:50:43.0 +
+@@ -66,7 +66,8 @@
+'filter.tcl'   = 'filter.tcl.OLD',
+'startup.tcl'  = 'startup.tcl.OLD',
+ 
+-   'motd.news'= 'motd.nnrpd'# Rename in INN 2.5.3.
++ # In Debian we handle this via the Debian conffile mechanism with 
dpkg-maintscript-helper
++   # 'motd.news'= 'motd.nnrpd'# Rename in INN 2.5.3.
+   );
+ 
+ # Clean up inn.conf for the new parser in INN 2.4.  Null keys (keys without
diff -Nru inn2-2.5.3/debian/patches/series inn2-2.5.3/debian/patches/series
--- inn2-2.5.3/debian/patches/series2011-04-14 00:06:03.0 +0100
+++ inn2-2.5.3/debian/patches/series2012-11-27 12:01:43.0 +
@@ -11,3 +11,4 @@
 # packaging-related
 no-makedbz-on-install
 
+debian-handle-motd-on-upgrade.patch


Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-28 Thread Marco d'Itri
On Nov 28, Russ Allbery r...@debian.org wrote:

 Marco, do you want to handle this update?  I'm happy to help here, but
 don't want to tromp on you if you'd rather take care of it.
Yes. I would appreciate if you could list any other patches that you 
think should be backported to the wheezy package.

-- 
ciao,
Marco


signature.asc
Description: Digital signature


Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-28 Thread Russ Allbery
m...@linux.it (Marco d'Itri) writes:
 On Nov 28, Russ Allbery r...@debian.org wrote:

 Marco, do you want to handle this update?  I'm happy to help here, but
 don't want to tromp on you if you'd rather take care of it.

 Yes. I would appreciate if you could list any other patches that you 
 think should be backported to the wheezy package.

There aren't any commits in the INN 2.3 branch since 2.5.3, so I think you
should be good otherwise.

-- 
Russ Allbery (r...@debian.org)   http://www.eyrie.org/~eagle/


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-27 Thread Nick Leverton
I've prepared a fix for this along the lines I suggested.  It proved
awkward to choose between mv_conffile and rm_conffile due to the
multi-stage nature of maintainer scripts, so I ended up using rm_conffile
and inserting some code in the postinst script to capture the dpkg-bak
file and rename it in the event that it had been modified.

If anyone would care to review and perhaps upload it, the dsc is at
http://mentors.debian.net/debian/pool/main/i/inn2/inn2_2.5.3-1.1.dsc
I am happy to deal with the unblock etc but would appreciate sponsoring
for the upload.  Failing that I shall go bother Mentors as usual :-)

Nick


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-27 Thread Russ Allbery
Julien ÉLIE jul...@trigofacile.com writes:

 Yeah, I'm inclined to agree with this, and wonder if INN should change
 its upstream behavior to install a sample in a path other than the one
 used by innd and nnrpd.

 That would also be fine, yes.
 Couldn't we install them as ${PATHETC}/motd.innd.sample and
 ${PATHETC}/motd.nnrpd.sample or should they be in a separate path?
 In the latter case, would the ${PATHETC}/samples directory be fine?

Looking at the files, they're mostly documentation for the facility.  I'm
wondering whether that's a useful thing to install.  The upside of
installing some sort of sample is that it makes it clear to people
installing a new server that this is something that can be done.  The
downside is that the files are not, themselves, actually useful; you
wouldn't use any part of their content when creating a real MOTD file.
They're just documentation.

That makes me feel like handling the documentation some other way, such as
pointers in INSTALL, may be a better idea than installing the sample file.

On second thought, installing them in a separate samples directory means
they aren't obviously there when someone is setting up a new server, so it
seems to eliminate most of the upside and add some additional complexity.

 Shouldn't we do the same for the ${PATHETC}/subscriptions file?  It
 already contains a list of newsgroups.

Yeah, but it's a fairly innocuous one that's been the same for many years.
There's not much there that will really hurt anything, so I'd be inclined
to leave that one alone.

 What for files like ${PATHETC}/actsync.ign?  Maybe the default behaviour
 is not the expected one.

It's not a horrible default, though.  It seems pretty safe to me.

-- 
Russ Allbery (r...@debian.org)   http://www.eyrie.org/~eagle/


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-27 Thread Russ Allbery
Nick Leverton n...@leverton.org writes:

 I've prepared a fix for this along the lines I suggested.  It proved
 awkward to choose between mv_conffile and rm_conffile due to the
 multi-stage nature of maintainer scripts, so I ended up using
 rm_conffile and inserting some code in the postinst script to capture
 the dpkg-bak file and rename it in the event that it had been modified.

 If anyone would care to review and perhaps upload it, the dsc is at
 http://mentors.debian.net/debian/pool/main/i/inn2/inn2_2.5.3-1.1.dsc I
 am happy to deal with the unblock etc but would appreciate sponsoring
 for the upload.  Failing that I shall go bother Mentors as usual :-)

Marco, do you want to handle this update?  I'm happy to help here, but
don't want to tromp on you if you'd rather take care of it.

-- 
Russ Allbery (r...@debian.org)   http://www.eyrie.org/~eagle/


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-26 Thread Julien ÉLIE

Hi Russ,


With current newsreaders the motd is just annoying.


Yeah, I'm inclined to agree with this, and wonder if INN should change its
upstream behavior to install a sample in a path other than the one used by
innd and nnrpd.


That would also be fine, yes.
Couldn't we install them as ${PATHETC}/motd.innd.sample and
${PATHETC}/motd.nnrpd.sample or should they be in a separate path?
In the latter case, would the ${PATHETC}/samples directory be fine?

Shouldn't we do the same for the ${PATHETC}/subscriptions file?  It already
contains a list of newsgroups.
What for files like ${PATHETC}/actsync.ign?  Maybe the default behaviour
is not the expected one.




my guess is that most sites
never set a MOTD, so installing one that's displayed by default is
probably not the right default behavior.


Too bad that news clients do not behave smarter...
They should cache a local copy or fingerprint of the message of the day
so that they could display the message to the user only upon modification.
Besides, they should provide a way to force the cached information to be
refreshed...

--
Julien ÉLIE


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-25 Thread Nick Leverton
On Sat, Nov 24, 2012 at 10:03:58PM +0100, Julien ÉLIE wrote:
 Hi Nick,
 
 We seem to have two things going on here:
 
 motd.innd is to be renamed to motd.nnrpd (by a means yet to be agreed);
 
 Do you mean motd.news (used by INN = 2.5.2) is to be renamed to
 motd.nnrpd (used by INN = 2.5.3)?
 
 motd.innd does not exist in INN 2.5.2.

Err yes, my mistake, thanks.

 Under the name motd.nnrpd it is no longer a conffile in the new package
 (as it is no longer shipped but it is used if present).
 
 motd.nnrpd is still shipped in INN 2.5.3.

...snips...
 /usr/share/doc/inn2/examples/motd.innd
 /usr/share/doc/inn2/examples/motd.nnrpd

That is not a conffile though because it is not in /etc (and the
problematic version in /etc is neither shipped nor installed).

 I believe something should be done in the 2.5.3 Debian package:
 motd.innd and motd.nnrpd should be installed in the /etc/news
 directory!

I would disagree on that one.  INN itself does not install them, they are
only there as examples for an admin who wants to use them.  I don't think
Debian needs to do extra things like installing optional example files
over and above those provided by the package or otherwise required for
it to work at all.  Other Debian packages do not do that (well maybe
some package does, but not as a general rule).

 Incidentally Russ Alberry reckons that the feature which requires this
 file is almost never used anyway:
 http://www.eyrie.org/~eagle/software/inn/docs/motd.news.html
 
 Yep, that's true.  This feature is not wide-spread.

The key point I find here is that this feature still works even if the
optional files are not installed into /etc/news.  They only need to be
created by the admin in order to provide a non-default output to the LIST
command.  Indeed on my own inn2 installation I made /etc/news/motd.news
into an empty file as otherwise trn does display it each time, so some
users definitely do not want the example files installed.

 I think this is the best for anyone who does use this file.  I'll try
 coding it up but can anyone see any holes in this idea in the meantime ?
 
 I hope the above comments will be of help.

Thank you; I am willing to go with the consensus but my own opinion is
as above.  Anyone else care to chip in please ?

Nick


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-25 Thread Julien ÉLIE

Hi Nick,


I believe something should be done in the 2.5.3 Debian package:
motd.innd and motd.nnrpd should be installed in the /etc/news
directory!


I would disagree on that one.  INN itself does not install them, they are
only there as examples for an admin who wants to use them.


No, INN installs both motd.innd and motd.nnrpd in /etc/news.
Have a look at site/Makefile in the INN upstream package:

PATH_MOTD_INND  = ${PATHETC}/motd.innd
PATH_MOTD_NNRPD = ${PATHETC}/motd.nnrpd
Makefile:$D$(PATH_MOTD_INND): motd.innd ; $(COPY_RPUB) $? $@
Makefile:$D$(PATH_MOTD_NNRPD): motd.nnrpd   ; $(COPY_RPUB) $? $@


Same thing for innreport.css that is installed in 
/usr/share/doc/inn2/examples whereas INN installs it in PATHHTTP 
(normally /var/log/news in Debian).




motd.news was properly installed by the Debian package for INN = 2.5.2 
in /etc/news.





Indeed on my own inn2 installation I made /etc/news/motd.news
into an empty file as otherwise trn does display it each time, so some
users definitely do not want the example files installed.


Two different things are mixed here:  the news administrator manages his 
server the way he wants.  It is up to him to configure his news server 
(feeds, newsgroups carried, cleanfeed policy, message of the day, etc.).
If a user is disturbed, then he should contact his news administrator to 
ask for a change in motd, the same way he would ask him to add 
newsgroups, change spam policies, etc.


--
Julien ÉLIE

« La perfection est atteinte non pas lorsqu'il n'y a plus rien à
  ajouter, mais lorsqu'il n'y a plus rien à retirer. » (Saint-
  Exupéry)


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-25 Thread Nick Leverton
Hi Julien,

On Sun, Nov 25, 2012 at 09:46:13PM +0100, Julien ÉLIE wrote:
 
 No, INN installs both motd.innd and motd.nnrpd in /etc/news.
 Have a look at site/Makefile in the INN upstream package:

 PATH_MOTD_INND= ${PATHETC}/motd.innd
 PATH_MOTD_NNRPD   = ${PATHETC}/motd.nnrpd
 Makefile:$D$(PATH_MOTD_INND): motd.innd   ; $(COPY_RPUB) $? $@
 Makefile:$D$(PATH_MOTD_NNRPD): motd.nnrpd ; $(COPY_RPUB) $? $@
 
 
 Same thing for innreport.css that is installed in
 /usr/share/doc/inn2/examples whereas INN installs it in PATHHTTP
 (normally /var/log/news in Debian).

You are absolutely right and I apologise again.

The files are in fact explicitly deleted from the install tree by
debian/rules and this change was made by our maintainer in the 2.5.2 -
2.5.3 packaging.

But this makes me still more reluctant to change it as it is not the
subject of the present bug, and fixes during freeze are supposed to be
as minimal as possible and only to address the actual RC problem.

 Two different things are mixed here:  the news administrator manages
 his server the way he wants.  It is up to him to configure his news
 server (feeds, newsgroups carried, cleanfeed policy, message of the
 day, etc.).
 If a user is disturbed, then he should contact his news
 administrator to ask for a change in motd, the same way he would ask
 him to add newsgroups, change spam policies, etc.

Myself I still don't see the point of installing an motd file that says,
effectively, this is a default so disregard it.  But I think we will
have to leave that point for Marco to decide on once Wheezy is released.

Nick


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-25 Thread Marco d'Itri
On Nov 25, Nick Leverton n...@leverton.org wrote:

 Myself I still don't see the point of installing an motd file that says,
 effectively, this is a default so disregard it.  But I think we will
 have to leave that point for Marco to decide on once Wheezy is released.
With hindsight, I think that you have a point about this.
With current newsreaders the motd is just annoying.

-- 
ciao,
Marco


signature.asc
Description: Digital signature


Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-25 Thread Russ Allbery
m...@linux.it (Marco d'Itri) writes:
 On Nov 25, Nick Leverton n...@leverton.org wrote:

 Myself I still don't see the point of installing an motd file that
 says, effectively, this is a default so disregard it.  But I think we
 will have to leave that point for Marco to decide on once Wheezy is
 released.

 With hindsight, I think that you have a point about this.
 With current newsreaders the motd is just annoying.

Yeah, I'm inclined to agree with this, and wonder if INN should change its
upstream behavior to install a sample in a path other than the one used by
innd and nnrpd.  If it were something that every site would want (but
customized), that would be one thing, but my guess is that most sites
never set a MOTD, so installing one that's displayed by default is
probably not the right default behavior.

-- 
Russ Allbery (r...@debian.org)   http://www.eyrie.org/~eagle/


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-24 Thread Nick Leverton
We seem to have two things going on here:

motd.innd is to be renamed to motd.nnrpd (by a means yet to be agreed);

Under the name motd.nnrpd it is no longer a conffile in the new package
(as it is no longer shipped but it is used if present).

Incidentally Russ Alberry reckons that the feature which requires this
file is almost never used anyway:
http://www.eyrie.org/~eagle/software/inn/docs/motd.news.html

I am thinking of patching innupgrade to not do the rename, and checking
the md5 against the current issued version in the maintainer scripts.
If they match then ask maintscript-helper to remove it (as this
is the upstream sample which has never been edited); if not then
let maintscript-helper do the rename.  This may satisfy the Debian
requirements for ability to interrupt and revert the process.

In Wheezy we will (all being well) then either have no file at all (if
it proclaimed This is a sample MOTD file under squeeze) or else have
a non-conffile that has been user created.

I think this is the best for anyone who does use this file.  I'll try
coding it up but can anyone see any holes in this idea in the meantime ?

Nick


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-24 Thread Julien ÉLIE

Hi Nick,


We seem to have two things going on here:

motd.innd is to be renamed to motd.nnrpd (by a means yet to be agreed);


Do you mean motd.news (used by INN = 2.5.2) is to be renamed to 
motd.nnrpd (used by INN = 2.5.3)?


motd.innd does not exist in INN 2.5.2.



Under the name motd.nnrpd it is no longer a conffile in the new package
(as it is no longer shipped but it is used if present).


motd.nnrpd is still shipped in INN 2.5.3.

If I have a look at the list of files installed by Debian packages, I see:

INN 2.5.2:

/etc/news/motd.news
/usr/share/doc/inn2/examples/active
/usr/share/doc/inn2/examples/innreport.css
/usr/share/doc/inn2/examples/newsgroups


INN 2.5.3:

/usr/share/doc/inn2/examples/active
/usr/share/doc/inn2/examples/innreport.css
/usr/share/doc/inn2/examples/motd.innd
/usr/share/doc/inn2/examples/motd.nnrpd
/usr/share/doc/inn2/examples/newsgroups


I believe something should be done in the 2.5.3 Debian package: 
motd.innd and motd.nnrpd should be installed in the /etc/news directory!




Incidentally Russ Alberry reckons that the feature which requires this
file is almost never used anyway:
http://www.eyrie.org/~eagle/software/inn/docs/motd.news.html


Yep, that's true.  This feature is not wide-spread.



In Wheezy we will (all being well) then either have no file at all (if
it proclaimed This is a sample MOTD file under squeeze) or else have
a non-conffile that has been user created.


I think it would be best to have both motd.innd and motd.nnrpd because 
they are already shipped in the package.  They should be installed in 
the right /etc/news directory.




I think this is the best for anyone who does use this file.  I'll try
coding it up but can anyone see any holes in this idea in the meantime ?


I hope the above comments will be of help.

--
Julien ÉLIE

« La perfection est atteinte non pas lorsqu'il n'y a plus rien à
  ajouter, mais lorsqu'il n'y a plus rien à retirer. » (Saint-
  Exupéry)


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-11-06 Thread gregor herrmann
On Wed, 10 Oct 2012 13:41:15 +0200, Julien ÉLIE wrote:

 /etc/news/motd.nnrpd and /etc/news/motd.innd are two new conf files
 shipped with INN 2.5.3.
 /etc/news/motd.news is no longer used.
 
 During a fresh install, motd.nnrpd and motd.innd are the two files shipped
 in the inn2 tarball.
 During an update, motd.innd is not installed.  And motd.news (if present)
 is moved to motd.nnrpd.  So motd.nnrpd can be present or not.


I looked at what happens with different versions, and what the
package does:

squeeze:

root@jadzia:/# ls -la /etc/news/motd*
-rw-r--r-- 1 root root 239 Dec 30  2010 /etc/news/motd.news

wheezy (upgrade from squeeze):

root@jadzia:/# ls -la /etc/news/motd*  
-rw-r--r-- 1 root root 239 Dec 30  2010 /etc/news/motd.nnrpd

wheezy (fresh install):   
   
root@jadzia:/# ls -la /etc/news/motd*  
ls: cannot access /etc/news/motd*: No such file or directory


In the current version, motd.innd and motd.nnrpd are installed only
as examples. So both of them are missing in /etc/news for fresh
installs.

On upgrades, innupgrade is called from the postinst and renames
motd.news to motd.nnrpd, and motd.innd is not installed.


(No idea at the moment how to represent the move done via innupgrade
with dpkg-maintscript-helper.)


Cheers,
gregor
 
-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT  SPI, fellow of the Free Software Foundation Europe
   `-   NP: Flying Pickets: Take My Breath Away


signature.asc
Description: Digital signature


Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-10-10 Thread Andreas Beckmann
Package: inn2
Version: 2.5.3-1
Severity: serious
User: debian...@lists.debian.org
Usertags: piuparts

Hi,

during a test with piuparts I noticed your package deletes a conffile
during the upgrade from squeeze to wheezy, debsums reports an error
afterwards:

1m24.8s ERROR: FAIL: debsums reports modifications inside the chroot:
  debsums: missing file /etc/news/motd.news (from inn2 package)

I couldn't find the deletion in the maintainer scripts, so it's probably
done by something something that is run from the maintainer scripts.

As the wheezy package no longer ships this file as a conffile, this looks
like an intentional deletion, but to do this properly and record it in
dpkg's database accordingly, please use
  dpkg-maintscript-helper rm_conffile
(ideally via debian/inn2.maintscript).


Andreas


inn2_2.5.3-1.log.gz
Description: GNU Zip compressed data


Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-10-10 Thread Andreas Beckmann
On 2012-10-10 12:37, Julien ÉLIE wrote:
 The file /etc/news/motd.news is renamed to /etc/news/motd.nnrpd by the
 innupgrade script shipped by upstream.

 Should this renaming by upstream be marked as a removal in the
 maintainter scripts?

/etc/news/motd.nnrpd is no longer shipped as a conffile? How is it
generated (if at all)? I don't see it in my sid chroot (pbuilder,
policy-rc.d forbids starting any service).

If it were still a conffile shipped by inn2,
  dpkg-maint-script-helper mv_conffile
would be the correct tool.

And how is the new file being cleaned up on purge if it exists?


Andreas


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-10-10 Thread Julien ÉLIE

Hi Andreas,


1m24.8s ERROR: FAIL: debsums reports modifications inside the chroot:
  debsums: missing file /etc/news/motd.news (from inn2 package)

I couldn't find the deletion in the maintainer scripts, so it's probably
done by something something that is run from the maintainer scripts.

As the wheezy package no longer ships this file as a conffile, this looks
like an intentional deletion, but to do this properly and record it in
dpkg's database accordingly, please use
  dpkg-maintscript-helper rm_conffile
(ideally via debian/inn2.maintscript).


The file /etc/news/motd.news is renamed to /etc/news/motd.nnrpd by the
innupgrade script shipped by upstream.

According to changelog for INN 2.5.3 :

Add support for LIST MOTD in innd.  Consequently, the motd.news
configuration file which was previously used only by nnrpd is renamed
to motd.nnrpd (innupgrade takes care of the rename).  innd uses the new
motd.innd file in pathetc for its message of the day.


Should this renaming by upstream be marked as a removal in the  
maintainter scripts?


--
Julien ÉLIE


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#690128: inn2: conffile disappearing during squeeze-wheezy upgrade: /etc/news/motd.news

2012-10-10 Thread Julien ÉLIE

Hi Andreas,


The file /etc/news/motd.news is renamed to /etc/news/motd.nnrpd by the
innupgrade script shipped by upstream.

Should this renaming by upstream be marked as a removal in the
maintainter scripts?


/etc/news/motd.nnrpd is no longer shipped as a conffile?


/etc/news/motd.nnrpd and /etc/news/motd.innd are two new conf files
shipped with INN 2.5.3.
/etc/news/motd.news is no longer used.



How is it generated (if at all)?


During a fresh install, motd.nnrpd and motd.innd are the two files shipped
in the inn2 tarball.
During an update, motd.innd is not installed.  And motd.news (if present)
is moved to motd.nnrpd.  So motd.nnrpd can be present or not.

INN works fine without the two files, don't worry.  They are just message
of the day informative files.



If it were still a conffile shipped by inn2,
  dpkg-maint-script-helper mv_conffile
would be the correct tool.

And how is the new file being cleaned up on purge if it exists?


I do not know.  I do not know much about Debian scripts.
I bet Marco will answer better!

--
Julien ÉLIE


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org