Bug#684732: unblock: nut/2.6.4-2

2012-12-24 Thread Arnaud Quette
All

Thanks a lot for your work! I've quickly checked (with a limited mobile
terminal) and everything seems fine.
Sorry for being MIA here,  but it will probably be for some more time...

All the best for end of the year celebrations.
Cheers,
Arnaud
(sent from my S3... please excuse my brevity)
Le 20 déc. 2012 20:47, Ivo De Decker ivo.dedec...@ugent.be a écrit :

 Hi Laurent,

 On Thu, Dec 20, 2012 at 08:19:21PM +0100, Laurent Bigonville wrote:
   I prepared an NMU that should fix both issues. The debdiff against
   wheezy and the debdiff -w against sid are attached. I will try to get
   this NMU uploaded soon.
 
  Looks good but (there is always a but :), /etc/init.d/nut is shipped in
  the nut package in squeeze, so I guess it should also be removed when
  upgrading that package. And in case of partial upgrade, I guess you also
  want to remove it when the nut-client package is installed as it will
  cause issue if both /etc/init.d/nut and /etc/init.d/nut-client are
  trying to start the same components.
 
  So I would say, remove it when upgrading nut, nut-client and nut-server
  (which is already the case). Am I correct here?

 Thanks for the review.

 I added it to nut-client as well (new debdiffs attached). Adding it to nut
 is
 not necessary, because nut depends on nut-client and nut-server, so if nut
 is
 installed, the old init script will be removed anyway by nut-client or
 nut-server.

 Cheers,

 Ivo




Bug#684732: unblock: nut/2.6.4-2

2012-12-22 Thread gregor herrmann
On Thu, 20 Dec 2012 20:47:13 +0100, Ivo De Decker wrote:

  Looks good but (there is always a but :),
 Thanks for the review.
 I added it to nut-client as well (new debdiffs attached). 

Thanks, uploaded with this debdiff (to DELAYED/1 in case the
maintainer or the RT want to take a last look).

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: Simon  Garfunkel: Somewhere They Can't Find Me


signature.asc
Description: Digital signature


Processed: Re: Bug#684732: unblock: nut/2.6.4-2

2012-12-20 Thread Debian Bug Tracking System
Processing control commands:

 tags -1 moreinfo
Bug #684732 [release.debian.org] unblock: nut/2.6.4-2.1
Ignoring request to alter tags of bug #684732 to the same tags previously set

-- 
684732: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684732
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.b684732.13560103937350.transcr...@bugs.debian.org



Bug#684732: unblock: nut/2.6.4-2

2012-12-20 Thread Julien Cristau
Control: tags -1 moreinfo

On Sun, Dec  2, 2012 at 19:43:44 +0100, Laurent Bigonville wrote:

 [...]
   +# make sure that conffiles are secured and have the correct
   ownerships
   +if [ -d /etc/nut/ ] ; then
   +  chown root:nut /etc/nut/
   +fi
   +for file in nut.conf upsmon.conf upssched.conf ; do
   +if [ -f /etc/nut/$file ] ; then
   +chown root:nut /etc/nut/$file
   +chmod 640 /etc/nut/$file
   +fi
   +done
   +
  
  I still think the chowns/chmods shouldn't be done on upgrades, if for
  whatever reason the local admin changed those that's their choice.
 
 Is this really blocking the transition? The version in squeeze is also
 doing this. We could remove this later I guess.
 
Well I'm not comfortable unblocking that code.

 [...]
   -  # re process nut.conf MODE so that it can be sourced
   -  NUT_MODE=`grep -e '^ *MODE' /etc/nut/nut.conf | tr -d  `
   -  sed s/^ *MODE.*/$NUT_MODE/ /etc/nut/nut.conf
/etc/nut/nut.conf.new
   -  mv /etc/nut/nut.conf.new /etc/nut/nut.conf
   +if dpkg --compare-versions $2 le 2.6.4-2~ ; then
   +rm -f /etc/init.d/nut
   +update-rc.d nut remove /dev/null
  
  If /etc/init.d/nut was a conffile, I don't think you get to rm -f it
  on upgrade, at least if it was modified.
 
 IIRC, I didn't use dpkg-maintscript-helper because the file is owned by
 the nut package in squeeze (which is now a metapackage) and it was not
 really working as expected. The init file should probably also be
 removed in the nut-client package to support partial upgrades.
 
What's the status here?  (You can do thinks correctly without using
dpkg-maintscript-helper, fwiw.)

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-12-20 Thread Laurent Bigonville
Le Thu, 20 Dec 2012 14:33:09 +0100,
Julien Cristau jcris...@debian.org a écrit :

 Control: tags -1 moreinfo
 
 On Sun, Dec  2, 2012 at 19:43:44 +0100, Laurent Bigonville wrote:
 
  [...]
+# make sure that conffiles are secured and have the correct
ownerships
+if [ -d /etc/nut/ ] ; then
+  chown root:nut /etc/nut/
+fi
+for file in nut.conf upsmon.conf upssched.conf ; do
+if [ -f /etc/nut/$file ] ; then
+chown root:nut /etc/nut/$file
+chmod 640 /etc/nut/$file
+fi
+done
+
   
   I still think the chowns/chmods shouldn't be done on upgrades, if
   for whatever reason the local admin changed those that's their
   choice.
  
  Is this really blocking the transition? The version in squeeze is
  also doing this. We could remove this later I guess.
  
 Well I'm not comfortable unblocking that code.
 
  [...]
-  # re process nut.conf MODE so that it can be sourced
-  NUT_MODE=`grep -e '^ *MODE' /etc/nut/nut.conf | tr -d 
`
-  sed s/^ *MODE.*/$NUT_MODE/ /etc/nut/nut.conf
 /etc/nut/nut.conf.new
-  mv /etc/nut/nut.conf.new /etc/nut/nut.conf
+if dpkg --compare-versions $2 le 2.6.4-2~ ; then
+rm -f /etc/init.d/nut
+update-rc.d nut remove /dev/null
   
   If /etc/init.d/nut was a conffile, I don't think you get to rm -f
   it on upgrade, at least if it was modified.
  
  IIRC, I didn't use dpkg-maintscript-helper because the file is
  owned by the nut package in squeeze (which is now a metapackage)
  and it was not really working as expected. The init file should
  probably also be removed in the nut-client package to support
  partial upgrades.
  
 What's the status here?  (You can do thinks correctly without using
 dpkg-maintscript-helper, fwiw.)

I have unfortunately not the time for this ATM, so if somebody else
want to tackle this, I have no objections.

Cheers

Laurent Bigonville


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20121220154322.6e669...@soldur.bigon.be



Bug#684732: unblock: nut/2.6.4-2

2012-12-20 Thread Ivo De Decker
Hi Laurent and Julien,

If I read the bug history correctly, there are only 2 remaining issues for the
unblock (the rest has been dealt with).

On Thu, Dec 20, 2012 at 03:43:22PM +0100, Laurent Bigonville wrote:
  On Sun, Dec  2, 2012 at 19:43:44 +0100, Laurent Bigonville wrote:
 +# make sure that conffiles are secured and have the correct
 ownerships
 +if [ -d /etc/nut/ ] ; then
 +  chown root:nut /etc/nut/
 +fi
 +for file in nut.conf upsmon.conf upssched.conf ; do
 +if [ -f /etc/nut/$file ] ; then
 +chown root:nut /etc/nut/$file
 +chmod 640 /etc/nut/$file
 +fi
 +done
 +

I still think the chowns/chmods shouldn't be done on upgrades, if
for whatever reason the local admin changed those that's their
choice.
   
   Is this really blocking the transition? The version in squeeze is
   also doing this. We could remove this later I guess.
   
  Well I'm not comfortable unblocking that code.

   [...]
 -  # re process nut.conf MODE so that it can be sourced
 -  NUT_MODE=`grep -e '^ *MODE' /etc/nut/nut.conf | tr -d 
 `
 -  sed s/^ *MODE.*/$NUT_MODE/ /etc/nut/nut.conf
  /etc/nut/nut.conf.new
 -  mv /etc/nut/nut.conf.new /etc/nut/nut.conf
 +if dpkg --compare-versions $2 le 2.6.4-2~ ; then
 +rm -f /etc/init.d/nut
 +update-rc.d nut remove /dev/null

If /etc/init.d/nut was a conffile, I don't think you get to rm -f
it on upgrade, at least if it was modified.
   
   IIRC, I didn't use dpkg-maintscript-helper because the file is
   owned by the nut package in squeeze (which is now a metapackage)
   and it was not really working as expected. The init file should
   probably also be removed in the nut-client package to support
   partial upgrades.
   
  What's the status here?  (You can do thinks correctly without using
  dpkg-maintscript-helper, fwiw.)

 I have unfortunately not the time for this ATM, so if somebody else
 want to tackle this, I have no objections.

I prepared an NMU that should fix both issues. The debdiff against wheezy and
the debdiff -w against sid are attached. I will try to get this NMU uploaded
soon.

Cheers,

Ivo

diff -Nru nut-2.6.4/debian/changelog nut-2.6.4/debian/changelog
--- nut-2.6.4/debian/changelog	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/changelog	2012-12-20 19:39:27.0 +0100
@@ -1,3 +1,50 @@
+nut (2.6.4-2.2) unstable; urgency=low
+
+  * Non-maintainer upload with fixes for wheezy.
+  * Only remove /etc/init.d/nut from previous version if there are no local
+changes.
+  * Only fix permissions of configfiles on first install.
+  * debian/control: Fix typo in package description. Thanks to Julien Cristau
+for spotting this.
+
+ -- Ivo De Decker ivo.dedec...@ugent.be  Thu, 20 Dec 2012 19:30:00 +0100
+
+nut (2.6.4-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older
+versions of the postinst (Closes: #677054)
+
+ -- Sébastien Villemot sebast...@debian.org  Mon, 26 Nov 2012 21:09:33 +0100
+
+nut (2.6.4-2) unstable; urgency=low
+
+  * debian/rules: Stop the nut-client before nut-server on systems using static
+boot ordering (Closes: #679451)
+  * debian/nut-server.postinst: Remove /etc/init.d/nut on upgrade
+(Closes: #677822)
+  * Rename nut-server.lintian-overrides to nut-client.lintian-overrides and
+adjust overrides now that ups-monitor is shipped in nut-client package
+(Closes: #677947)
+  * Add debian/patches/0001-fix-upsmon-regression.patch: Fix upsmon/upssched
+regression (Taken from upstream) (Closes: #679513)
+  * Move nut metapackage to Section: metapackages
+  * Also create nut user when installing nut-client package and do not delete
+it on purge anymore (Closes: #682000)
+  * Drop /etc/default/nut → /etc/nut/nut.conf migration code, migration
+happends before squeeze release and this was against policy to have a
+maintainer script modifying a conffile in the first place (Closes: #684392)
+  * Add dependency against adduser and lsb-base on nut-client package
+  * Be sure that client is stopped before the server also when using
+dependencies based boot
+  * Fix package descriptions (Closes: #678068)
+  * Also install /bin/upssched-cmd in nut-client package as this script is
+referenced in default upssched.conf config file
+  * debian/watch: Update watch file
+  * Be sure that all maintainer scripts are returning 0 at their end
+
+ -- Laurent Bigonville bi...@debian.org  Sun, 12 Aug 2012 20:38:52 +0200
+
 nut (2.6.4-1) unstable; urgency=high
 
   * New upstream release (Closes: #671444)
diff -Nru nut-2.6.4/debian/control nut-2.6.4/debian/control
--- nut-2.6.4/debian/control	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/control	2012-12-20 19:39:27.0 +0100
@@ -24,6 +24,7 @@
 
 Package: nut
 

Bug#684732: unblock: nut/2.6.4-2

2012-12-20 Thread Laurent Bigonville
Le Thu, 20 Dec 2012 19:57:19 +0100,
Ivo De Decker ivo.dedec...@ugent.be a écrit :

 Hi Laurent and Julien,

Hello

 
 I prepared an NMU that should fix both issues. The debdiff against
 wheezy and the debdiff -w against sid are attached. I will try to get
 this NMU uploaded soon.

Looks good but (there is always a but :), /etc/init.d/nut is shipped in
the nut package in squeeze, so I guess it should also be removed when
upgrading that package. And in case of partial upgrade, I guess you also
want to remove it when the nut-client package is installed as it will
cause issue if both /etc/init.d/nut and /etc/init.d/nut-client are
trying to start the same components.

So I would say, remove it when upgrading nut, nut-client and nut-server
(which is already the case). Am I correct here?

Cheers

Laurent Bigonville


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20121220201921.172cc...@soldur.bigon.be



Bug#684732: unblock: nut/2.6.4-2

2012-12-20 Thread Ivo De Decker
Hi Laurent,

On Thu, Dec 20, 2012 at 08:19:21PM +0100, Laurent Bigonville wrote:
  I prepared an NMU that should fix both issues. The debdiff against
  wheezy and the debdiff -w against sid are attached. I will try to get
  this NMU uploaded soon.
 
 Looks good but (there is always a but :), /etc/init.d/nut is shipped in
 the nut package in squeeze, so I guess it should also be removed when
 upgrading that package. And in case of partial upgrade, I guess you also
 want to remove it when the nut-client package is installed as it will
 cause issue if both /etc/init.d/nut and /etc/init.d/nut-client are
 trying to start the same components.
 
 So I would say, remove it when upgrading nut, nut-client and nut-server
 (which is already the case). Am I correct here?

Thanks for the review.

I added it to nut-client as well (new debdiffs attached). Adding it to nut is
not necessary, because nut depends on nut-client and nut-server, so if nut is
installed, the old init script will be removed anyway by nut-client or
nut-server.

Cheers,

Ivo

diff -Nru nut-2.6.4/debian/changelog nut-2.6.4/debian/changelog
--- nut-2.6.4/debian/changelog	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/changelog	2012-12-20 20:40:14.0 +0100
@@ -1,3 +1,52 @@
+nut (2.6.4-2.2) unstable; urgency=low
+
+  * Non-maintainer upload with fixes for wheezy.
+  * Only remove /etc/init.d/nut from previous versions of nut in nut-server
+postinst if there are no local changes.
+  * Also remove /etc/init.d/nut in nut-client postinst. Thanks to 
+Laurent Bigonville for the hint.
+  * Only fix permissions of configfiles on first install.
+  * debian/control: Fix typo in package description. Thanks to Julien Cristau
+for spotting this.
+
+ -- Ivo De Decker ivo.dedec...@ugent.be  Thu, 20 Dec 2012 20:40:01 +0100
+
+nut (2.6.4-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older
+versions of the postinst (Closes: #677054)
+
+ -- Sébastien Villemot sebast...@debian.org  Mon, 26 Nov 2012 21:09:33 +0100
+
+nut (2.6.4-2) unstable; urgency=low
+
+  * debian/rules: Stop the nut-client before nut-server on systems using static
+boot ordering (Closes: #679451)
+  * debian/nut-server.postinst: Remove /etc/init.d/nut on upgrade
+(Closes: #677822)
+  * Rename nut-server.lintian-overrides to nut-client.lintian-overrides and
+adjust overrides now that ups-monitor is shipped in nut-client package
+(Closes: #677947)
+  * Add debian/patches/0001-fix-upsmon-regression.patch: Fix upsmon/upssched
+regression (Taken from upstream) (Closes: #679513)
+  * Move nut metapackage to Section: metapackages
+  * Also create nut user when installing nut-client package and do not delete
+it on purge anymore (Closes: #682000)
+  * Drop /etc/default/nut → /etc/nut/nut.conf migration code, migration
+happends before squeeze release and this was against policy to have a
+maintainer script modifying a conffile in the first place (Closes: #684392)
+  * Add dependency against adduser and lsb-base on nut-client package
+  * Be sure that client is stopped before the server also when using
+dependencies based boot
+  * Fix package descriptions (Closes: #678068)
+  * Also install /bin/upssched-cmd in nut-client package as this script is
+referenced in default upssched.conf config file
+  * debian/watch: Update watch file
+  * Be sure that all maintainer scripts are returning 0 at their end
+
+ -- Laurent Bigonville bi...@debian.org  Sun, 12 Aug 2012 20:38:52 +0200
+
 nut (2.6.4-1) unstable; urgency=high
 
   * New upstream release (Closes: #671444)
diff -Nru nut-2.6.4/debian/control nut-2.6.4/debian/control
--- nut-2.6.4/debian/control	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/control	2012-12-20 20:40:14.0 +0100
@@ -24,6 +24,7 @@
 
 Package: nut
 Architecture: all
+Section: metapackages
 Depends: ${misc:Depends}, nut-server, nut-client
 Description: network UPS tools - metapackage
  Network UPS Tools (NUT) is a client/server monitoring system that
@@ -32,7 +33,8 @@
  through the server, and are notified whenever the power status
  changes.
  .
- This package is a metapackage that install both nut-server and nut-client
+ This package is a metapackage that installs both nut-server and nut-client,
+ in most cases it is sufficient for a basic UPS monitoring system.
 
 Package: nut-server
 Architecture: any
@@ -50,12 +52,11 @@
  changes.
  .
  This package provides NUT's core system, and the serial and USB UPS
- drivers. In most cases it is sufficient for a basic UPS monitoring
- system.
+ drivers.
 
 Package: nut-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (= 3.0-6)
 Provides: ups-monitor
 Conflicts: ups-monitor, nut-server ( 2.6.3-1)
 Recommends: bash-completion
diff -Nru nut-2.6.4/debian/gbp.conf nut-2.6.4/debian/gbp.conf
--- 

Bug#684732: unblock: nut/2.6.4-2

2012-12-02 Thread Laurent Bigonville
On Sat, 1 Dec 2012 12:13:06 +0100, Julien Cristau wrote:
 On Mon, Nov 26, 2012 at 21:50:17 +0100, Sébastien Villemot wrote:
 
  Control: retitle -1 unblock: nut/2.6.4-2.1
  
  Upon request of Arnaud Quette, I have uploaded a NMU of nut
  versioned 2.6.4-2.1, which fixes RC bug #677054. The change
  relative to the previous version in unstable (2.6.4-2) is that I
  have added a preinst script in nut-client.
  
  For completeness, I attach the debdiff of the new version
  (2.6.4-2.1) against the version currently in Wheezy (2.6.4-1).
  
 
  diff -Nru nut-2.6.4/debian/control nut-2.6.4/debian/control
  --- nut-2.6.4/debian/control2012-06-06 21:06:03.0
  +0200 +++ nut-2.6.4/debian/control  2012-08-12
  20:39:01.0 +0200 @@ -24,6 +24,7 @@
   
   Package: nut
   Architecture: all
  +Section: metapackages
   Depends: ${misc:Depends}, nut-server, nut-client
   Description: network UPS tools - metapackage
Network UPS Tools (NUT) is a client/server monitoring system that
  @@ -32,7 +33,8 @@
through the server, and are notified whenever the power status
changes.
.
  - This package is a metapackage that install both nut-server and
  nut-client
  + This package is a metapackage that install both nut-server and
  nut-client,
  + in most cases it is sufficient for a basic UPS monitoring system.
   
 s/install/s/

Thanks, fixed in git

[...]
  diff -Nru nut-2.6.4/debian/nut-cgi.postrm
  nut-2.6.4/debian/nut-cgi.postrm ---
  nut-2.6.4/debian/nut-cgi.postrm 2012-06-06
  21:06:03.0 +0200 +++ nut-2.6.4/debian/nut-cgi.postrm
  2012-08-12 20:39:01.0 +0200 @@ -44,3 +44,4 @@ 
   #DEBHELPER#
   
  +exit 0
 
 Why?  Changelog doesn't seem to mention it.

If a condition is failing earlier in the script (which can be expected),
it's possible that the script will exit with a != 0 status.

 
  diff -Nru nut-2.6.4/debian/nut-client.lintian-overrides
  nut-2.6.4/debian/nut-client.lintian-overrides ---
  nut-2.6.4/debian/nut-client.lintian-overrides   1970-01-01
  01:00:00.0 +0100 +++
  nut-2.6.4/debian/nut-client.lintian-overrides   2012-08-12
  20:39:01.0 +0200 @@ -0,0 +1 @@ +nut-client:
  script-in-etc-init.d-not-registered-via-update-rc.d
 
 What is that about?

The package is shipping a symlink (ups-monitor - nut-client) which is
used by /etc/init.d/halt to cut the power off the UPS. This symlink
should obviously not be added to any runlevel.

[...]
  +# make sure that conffiles are secured and have the correct
  ownerships
  +if [ -d /etc/nut/ ] ; then
  +  chown root:nut /etc/nut/
  +fi
  +for file in nut.conf upsmon.conf upssched.conf ; do
  +if [ -f /etc/nut/$file ] ; then
  +chown root:nut /etc/nut/$file
  +chmod 640 /etc/nut/$file
  +fi
  +done
  +
 
 I still think the chowns/chmods shouldn't be done on upgrades, if for
 whatever reason the local admin changed those that's their choice.

Is this really blocking the transition? The version in squeeze is also
doing this. We could remove this later I guess.

[...]
  -  # re process nut.conf MODE so that it can be sourced
  -  NUT_MODE=`grep -e '^ *MODE' /etc/nut/nut.conf | tr -d  `
  -  sed s/^ *MODE.*/$NUT_MODE/ /etc/nut/nut.conf
   /etc/nut/nut.conf.new
  -  mv /etc/nut/nut.conf.new /etc/nut/nut.conf
  +if dpkg --compare-versions $2 le 2.6.4-2~ ; then
  +rm -f /etc/init.d/nut
  +update-rc.d nut remove /dev/null
 
 If /etc/init.d/nut was a conffile, I don't think you get to rm -f it
 on upgrade, at least if it was modified.

IIRC, I didn't use dpkg-maintscript-helper because the file is owned by
the nut package in squeeze (which is now a metapackage) and it was not
really working as expected. The init file should probably also be
removed in the nut-client package to support partial upgrades.

Cheers

Laurent Bigonville


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20121202194344.28b85...@fornost.bigon.be



Bug#684732: unblock: nut/2.6.4-2

2012-12-01 Thread Julien Cristau
On Mon, Nov 26, 2012 at 21:50:17 +0100, Sébastien Villemot wrote:

 Control: retitle -1 unblock: nut/2.6.4-2.1
 
 Upon request of Arnaud Quette, I have uploaded a NMU of nut versioned
 2.6.4-2.1, which fixes RC bug #677054. The change relative to the
 previous version in unstable (2.6.4-2) is that I have added a preinst
 script in nut-client.
 
 For completeness, I attach the debdiff of the new version (2.6.4-2.1)
 against the version currently in Wheezy (2.6.4-1).
 

 diff -Nru nut-2.6.4/debian/control nut-2.6.4/debian/control
 --- nut-2.6.4/debian/control  2012-06-06 21:06:03.0 +0200
 +++ nut-2.6.4/debian/control  2012-08-12 20:39:01.0 +0200
 @@ -24,6 +24,7 @@
  
  Package: nut
  Architecture: all
 +Section: metapackages
  Depends: ${misc:Depends}, nut-server, nut-client
  Description: network UPS tools - metapackage
   Network UPS Tools (NUT) is a client/server monitoring system that
 @@ -32,7 +33,8 @@
   through the server, and are notified whenever the power status
   changes.
   .
 - This package is a metapackage that install both nut-server and nut-client
 + This package is a metapackage that install both nut-server and nut-client,
 + in most cases it is sufficient for a basic UPS monitoring system.
  
s/install/s/

  Package: nut-server
  Architecture: any
 @@ -50,12 +52,11 @@
   changes.
   .
   This package provides NUT's core system, and the serial and USB UPS
 - drivers. In most cases it is sufficient for a basic UPS monitoring
 - system.
 + drivers.
  
  Package: nut-client
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (= 3.0-6)
  Provides: ups-monitor
  Conflicts: ups-monitor, nut-server ( 2.6.3-1)
  Recommends: bash-completion
 diff -Nru nut-2.6.4/debian/nut-cgi.postrm nut-2.6.4/debian/nut-cgi.postrm
 --- nut-2.6.4/debian/nut-cgi.postrm   2012-06-06 21:06:03.0 +0200
 +++ nut-2.6.4/debian/nut-cgi.postrm   2012-08-12 20:39:01.0 +0200
 @@ -44,3 +44,4 @@
  
  #DEBHELPER#
  
 +exit 0

Why?  Changelog doesn't seem to mention it.

 diff -Nru nut-2.6.4/debian/nut-client.lintian-overrides 
 nut-2.6.4/debian/nut-client.lintian-overrides
 --- nut-2.6.4/debian/nut-client.lintian-overrides 1970-01-01 
 01:00:00.0 +0100
 +++ nut-2.6.4/debian/nut-client.lintian-overrides 2012-08-12 
 20:39:01.0 +0200
 @@ -0,0 +1 @@
 +nut-client: script-in-etc-init.d-not-registered-via-update-rc.d

What is that about?

 diff -Nru nut-2.6.4/debian/nut-client.postinst 
 nut-2.6.4/debian/nut-client.postinst
 --- nut-2.6.4/debian/nut-client.postinst  1970-01-01 01:00:00.0 
 +0100
 +++ nut-2.6.4/debian/nut-client.postinst  2012-08-12 20:39:01.0 
 +0200
 @@ -0,0 +1,63 @@
 +#!/bin/sh -e
 +
 +case $1 in
 +
 +  configure)
 +
 +# make sure the nut user exists and has correct memberships
 +if ! getent group nut /dev/null; then
 +  addgroup --quiet --system nut
 +fi
 +if ! getent passwd nut /dev/null; then
 +  adduser --quiet --system --ingroup nut --home /var/lib/nut 
 --no-create-home nut
 +elif ! groups nut | grep -qw nut; then
 +  adduser nut nut
 +fi
 +# for Ubuntu, while waiting for a proper debconf
 +#if ! groups nut | grep -qw dialout; then
 +#adduser nut dialout
 +#fi
 +
 +# make sure that conffiles are secured and have the correct ownerships
 +if [ -d /etc/nut/ ] ; then
 +  chown root:nut /etc/nut/
 +fi
 +for file in nut.conf upsmon.conf upssched.conf ; do
 +if [ -f /etc/nut/$file ] ; then
 +chown root:nut /etc/nut/$file
 +chmod 640 /etc/nut/$file
 +fi
 +done
 +

I still think the chowns/chmods shouldn't be done on upgrades, if for
whatever reason the local admin changed those that's their choice.

 +# make sure that /var/run/nut exists and has the correct ownerships
 +if [ ! -d /var/run/nut ] ; then
 +mkdir -p /var/run/nut
 +fi
 +if [ -d /var/run/nut ] ; then
 +chown root:nut /var/run/nut
 +chmod 770 /var/run/nut
 +fi
 +;;
 +
 +  abort-upgrade)
 +# do nothing
 +;;
 +
 +  abort-remove)
 +# do nothing
 +;;
 +
 +  abort-deconfigure)
 +# do nothing
 +;;
 +
 +  *)
 +echo $0: incorrect arguments: $* 2
 +exit 1
 +;;
 +
 +esac
 +
 +#DEBHELPER#
 +
 +exit 0
 diff -Nru nut-2.6.4/debian/nut-server.postinst 
 nut-2.6.4/debian/nut-server.postinst
 --- nut-2.6.4/debian/nut-server.postinst  2012-06-06 21:06:03.0 
 +0200
 +++ nut-2.6.4/debian/nut-server.postinst  2012-08-12 20:39:01.0 
 +0200
 @@ -22,7 +22,7 @@
  if [ -d /etc/nut/ ] ; then
chown root:nut /etc/nut/
  fi
 -for file in nut.conf ups.conf upsd.conf upsmon.conf upsd.users 
 upssched.conf ; do
 +for file in ups.conf upsd.conf upsd.users ; do
  if [ -f /etc/nut/$file ] ; then
  chown root:nut /etc/nut/$file
  chmod 640 /etc/nut/$file
 @@ -50,67 

Bug#684732: unblock: nut/2.6.4-2

2012-11-26 Thread Arnaud Quette
Hi everybody,

sorry for the lag in answering... too many real life issues to deal with.

2012/11/26 Julien Cristau jcris...@debian.org

 On Sun, Nov 11, 2012 at 22:42:09 +0100, Laurent Bigonville wrote:

  Le Sun, 11 Nov 2012 19:06:52 +0100,
  Julien Cristau jcris...@debian.org a écrit :
 
   One more question...
  
   On Mon, Aug 13, 2012 at 15:36:14 +0200, Laurent Bigonville wrote:
  
+for file in nut.conf upsmon.conf upssched.conf ; do
+if [ -f /etc/nut/$file ] ; then
+chown root:nut /etc/nut/$file
+chmod 640 /etc/nut/$file
+fi
+done
  
   why is this is done unconditionally on postinst configure, instead of
   just on first install?
 
  These files could contains passwords, I guess that this is done to be
  really sure the files are not world readable? Arnaud?
 
 Doing that when the file is created is fine.  But not every time
 postinst runs, IMO.


this is indeed to enforce that files have still the proper permissions for
the nut user, as mentioned by Laurent, since we still lack a configuration
tool to assist this.  Having anything else than the above may results in
NUT not being able to start or some security hole.

I don't see any specific issue with this one.

cheers,
Arnaud
-- 
NUT (Network UPS Tools) Project Leader - http://www.networkupstools.org
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.fr


Bug#684732: unblock: nut/2.6.4-2

2012-11-26 Thread Arnaud Quette
Hi Michael,

2012/11/26 Michael Biebl bi...@debian.org

 On 26.11.2012 01:58, Michael Biebl wrote:
  +if [ -d /var/run/nut ] ; then
  +chown root:nut /var/run/nut
  +chmod 770 /var/run/nut
  +fi

  d /var/run/nut 0770 nut nut - -

 A small bug slipped through, the correct config would be

 d /var/run/nut 0770 root nut - -


thanks for pointing this. this will complete nut systemd support.
I'll also be looking at it.

cheers,
Arnaud
-- 
Engineering Linux/Unix Expert - Opensource Solutions Lead - Eaton -
http://opensource.eaton.com
NUT (Network UPS Tools) Project Leader - http://www.networkupstools.org
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.fr


Processed: Re: Bug#684732: unblock: nut/2.6.4-2

2012-11-26 Thread Debian Bug Tracking System
Processing control commands:

 retitle -1 unblock: nut/2.6.4-2.1
Bug #684732 [release.debian.org] unblock: nut/2.6.4-2
Changed Bug title to 'unblock: nut/2.6.4-2.1' from 'unblock: nut/2.6.4-2'

-- 
684732: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684732
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/handler.s.b684732.135396303111458.transcr...@bugs.debian.org



Bug#684732: unblock: nut/2.6.4-2

2012-11-26 Thread Sébastien Villemot
Control: retitle -1 unblock: nut/2.6.4-2.1

Upon request of Arnaud Quette, I have uploaded a NMU of nut versioned
2.6.4-2.1, which fixes RC bug #677054. The change relative to the
previous version in unstable (2.6.4-2) is that I have added a preinst
script in nut-client.

For completeness, I attach the debdiff of the new version (2.6.4-2.1)
against the version currently in Wheezy (2.6.4-1).

diff -Nru nut-2.6.4/debian/changelog nut-2.6.4/debian/changelog
--- nut-2.6.4/debian/changelog	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/changelog	2012-11-26 21:09:33.0 +0100
@@ -1,3 +1,39 @@
+nut (2.6.4-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older
+versions of the postinst (Closes: #677054)
+
+ -- Sébastien Villemot sebast...@debian.org  Mon, 26 Nov 2012 21:09:33 +0100
+
+nut (2.6.4-2) unstable; urgency=low
+
+  * debian/rules: Stop the nut-client before nut-server on systems using static
+boot ordering (Closes: #679451)
+  * debian/nut-server.postinst: Remove /etc/init.d/nut on upgrade
+(Closes: #677822)
+  * Rename nut-server.lintian-overrides to nut-client.lintian-overrides and
+adjust overrides now that ups-monitor is shipped in nut-client package
+(Closes: #677947)
+  * Add debian/patches/0001-fix-upsmon-regression.patch: Fix upsmon/upssched
+regression (Taken from upstream) (Closes: #679513)
+  * Move nut metapackage to Section: metapackages
+  * Also create nut user when installing nut-client package and do not delete
+it on purge anymore (Closes: #682000)
+  * Drop /etc/default/nut → /etc/nut/nut.conf migration code, migration
+happends before squeeze release and this was against policy to have a
+maintainer script modifying a conffile in the first place (Closes: #684392)
+  * Add dependency against adduser and lsb-base on nut-client package
+  * Be sure that client is stopped before the server also when using
+dependencies based boot
+  * Fix package descriptions (Closes: #678068)
+  * Also install /bin/upssched-cmd in nut-client package as this script is
+referenced in default upssched.conf config file
+  * debian/watch: Update watch file
+  * Be sure that all maintainer scripts are returning 0 at their end
+
+ -- Laurent Bigonville bi...@debian.org  Sun, 12 Aug 2012 20:38:52 +0200
+
 nut (2.6.4-1) unstable; urgency=high
 
   * New upstream release (Closes: #671444)
diff -Nru nut-2.6.4/debian/control nut-2.6.4/debian/control
--- nut-2.6.4/debian/control	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/control	2012-08-12 20:39:01.0 +0200
@@ -24,6 +24,7 @@
 
 Package: nut
 Architecture: all
+Section: metapackages
 Depends: ${misc:Depends}, nut-server, nut-client
 Description: network UPS tools - metapackage
  Network UPS Tools (NUT) is a client/server monitoring system that
@@ -32,7 +33,8 @@
  through the server, and are notified whenever the power status
  changes.
  .
- This package is a metapackage that install both nut-server and nut-client
+ This package is a metapackage that install both nut-server and nut-client,
+ in most cases it is sufficient for a basic UPS monitoring system.
 
 Package: nut-server
 Architecture: any
@@ -50,12 +52,11 @@
  changes.
  .
  This package provides NUT's core system, and the serial and USB UPS
- drivers. In most cases it is sufficient for a basic UPS monitoring
- system.
+ drivers.
 
 Package: nut-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (= 3.0-6)
 Provides: ups-monitor
 Conflicts: ups-monitor, nut-server ( 2.6.3-1)
 Recommends: bash-completion
diff -Nru nut-2.6.4/debian/gbp.conf nut-2.6.4/debian/gbp.conf
--- nut-2.6.4/debian/gbp.conf	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/gbp.conf	2012-08-12 20:39:01.0 +0200
@@ -1,6 +1,6 @@
 [DEFAULT]
-debian-branch = debian
-upstream-branch = upstream
+debian-branch = debian-wheezy
+upstream-branch = upstream-wheezy
 pristine-tar = True
 
 [git-buildpackage]
diff -Nru nut-2.6.4/debian/nut-cgi.postrm nut-2.6.4/debian/nut-cgi.postrm
--- nut-2.6.4/debian/nut-cgi.postrm	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/nut-cgi.postrm	2012-08-12 20:39:01.0 +0200
@@ -44,3 +44,4 @@
 
 #DEBHELPER#
 
+exit 0
diff -Nru nut-2.6.4/debian/nut-client.install nut-2.6.4/debian/nut-client.install
--- nut-2.6.4/debian/nut-client.install	2012-06-06 21:06:03.0 +0200
+++ nut-2.6.4/debian/nut-client.install	2012-08-12 20:39:01.0 +0200
@@ -4,6 +4,7 @@
 debian/tmp/bin/upscmd
 debian/tmp/sbin/upsmon
 debian/tmp/sbin/upssched
+debian/tmp/bin/upssched-cmd
 debian/tmp/etc/bash_completion.d/nut
 debian/tmp/etc/nut/nut.conf
 debian/tmp/etc/nut/upsmon.conf
diff -Nru nut-2.6.4/debian/nut-client.lintian-overrides nut-2.6.4/debian/nut-client.lintian-overrides
--- nut-2.6.4/debian/nut-client.lintian-overrides	1970-01-01 01:00:00.0 +0100
+++ 

Bug#684732: unblock: nut/2.6.4-2

2012-11-25 Thread Julien Cristau
On Sun, Nov 11, 2012 at 22:42:09 +0100, Laurent Bigonville wrote:

 Le Sun, 11 Nov 2012 19:06:52 +0100,
 Julien Cristau jcris...@debian.org a écrit :
 
  One more question...
  
  On Mon, Aug 13, 2012 at 15:36:14 +0200, Laurent Bigonville wrote:
  
   +for file in nut.conf upsmon.conf upssched.conf ; do
   +if [ -f /etc/nut/$file ] ; then
   +chown root:nut /etc/nut/$file
   +chmod 640 /etc/nut/$file
   +fi
   +done
  
  why is this is done unconditionally on postinst configure, instead of
  just on first install?
 
 These files could contains passwords, I guess that this is done to be
 really sure the files are not world readable? Arnaud?
 
Doing that when the file is created is fine.  But not every time
postinst runs, IMO.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-11-25 Thread Julien Cristau
On Sun, Nov 11, 2012 at 22:43:42 +0100, Laurent Bigonville wrote:

 Le Sun, 11 Nov 2012 19:07:46 +0100,
 Julien Cristau jcris...@debian.org a écrit :
 
  On Sat, Sep 29, 2012 at 21:12:09 +0200, Laurent Bigonville wrote:
  
   Le Sat, 29 Sep 2012 20:56:11 +0200,
   Julien Cristau jcris...@debian.org a écrit :
   

why is the last bit needed?

  
  I didn't get a reply to the above (why you need adduser nut nut).
 
 See #493159
 
 This is to fix a situation were the user nut was not created without
 being added to the group. Is that correct Arnaud?
 
Well that bug is marked as fixed in 2.2.2-7, which is way before
squeeze.  I suppose it can stay, it just seems useless.

  
+if [ -d /var/run/nut ] ; then
+chown root:nut /var/run/nut
+chmod 770 /var/run/nut
+fi

why does the nut user need write access there?  And why is this
created in postinst instead of an init script?
   
   nut should be able to create sockets in that directory.
   
   This is probably a bit redundant as this is also done in the
   initscript.
   
  Then I'd prefer to not have it in postinst.
 
 Well this was a copy/paste of the nut-server postinstall script, so
 this should also be removed from that file too. Do you want me to do
 that for wheezy?

Please.

 The maintainer scripts should probably reworked a bit,
 but that will be for later I guess.
 
Certainly not for right now indeed :)

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-11-25 Thread Michael Biebl
On 12.11.2012 13:34, Arnaud Quette wrote:
 2012/11/11 Laurent Bigonville bi...@debian.org
 Le Sun, 11 Nov 2012 19:07:46 +0100,
 Julien Cristau jcris...@debian.org a écrit :
 On Sat, Sep 29, 2012 at 21:12:09 +0200, Laurent Bigonville wrote:

 Le Sat, 29 Sep 2012 20:56:11 +0200,
 Julien Cristau jcris...@debian.org a écrit :
 +if [ -d /var/run/nut ] ; then
 +chown root:nut /var/run/nut
 +chmod 770 /var/run/nut
 +fi

 why does the nut user need write access there?  And why is this
 created in postinst instead of an init script?

 nut should be able to create sockets in that directory.

 This is probably a bit redundant as this is also done in the
 initscript.

 Then I'd prefer to not have it in postinst.

 Well this was a copy/paste of the nut-server postinstall script, so
 this should also be removed from that file too. Do you want me to do
 that for wheezy?
 
 
 right, that's part of the legacy (dead) code, prior to the volatile /var
 move.
 good to remove, since it's addressed in the sysV initscript.
 the question will probably pop-up again with systemd though!

On the chance that this is getting OT:
For systemd you would ship a tmpfiles [1] snippet like
/usr/lib/tmpfiles.d/nut.conf containing

d /var/run/nut 0770 nut nut - -

This would automatically create the run time directory during boot.

Tollef and I are of the opinion this might be useful also for
non-systemd systems and for jessie we'd like to propose that as a
general approach to create run time directories.

Cheers,
Michael


[1] http://www.freedesktop.org/software/systemd/man/tmpfiles.d.html


-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



signature.asc
Description: OpenPGP digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-11-25 Thread Michael Biebl
On 26.11.2012 01:58, Michael Biebl wrote:
 +if [ -d /var/run/nut ] ; then
 +chown root:nut /var/run/nut
 +chmod 770 /var/run/nut
 +fi

 d /var/run/nut 0770 nut nut - -

A small bug slipped through, the correct config would be

d /var/run/nut 0770 root nut - -





-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



signature.asc
Description: OpenPGP digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-11-12 Thread Arnaud Quette
Hi Laurent and Julien,

2012/11/11 Laurent Bigonville bi...@debian.org

 Le Sun, 11 Nov 2012 19:06:52 +0100,
 Julien Cristau jcris...@debian.org a écrit :

  One more question...
 
  On Mon, Aug 13, 2012 at 15:36:14 +0200, Laurent Bigonville wrote:
 
   +for file in nut.conf upsmon.conf upssched.conf ; do
   +if [ -f /etc/nut/$file ] ; then
   +chown root:nut /etc/nut/$file
   +chmod 640 /etc/nut/$file
   +fi
   +done
 
  why is this is done unconditionally on postinst configure, instead of
  just on first install?

 These files could contains passwords, I guess that this is done to be
 really sure the files are not world readable? Arnaud?


this is indeed to enforce security on these files, as Laurent said:
ups.conf may contains SNMP credentials, upsd.users and upsmon.conf contain
NUT internal users password.

Thus, it's *mandatory* to ensure protection. The above is just a test upon
install / update, but the same is planned for the configuration editing
library and tools (work underway).

cheers,
Arnaud
-- 
Linux / Unix / Opensource Engineering Expert - Eaton -
http://opensource.eaton.com
Network UPS Tools (NUT) Project Leader - http://www.networkupstools.org
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.fr


Bug#684732: unblock: nut/2.6.4-2

2012-11-12 Thread Arnaud Quette
Hi again guys,

2012/11/11 Laurent Bigonville bi...@debian.org

 Le Sun, 11 Nov 2012 19:07:46 +0100,
 Julien Cristau jcris...@debian.org a écrit :

  On Sat, Sep 29, 2012 at 21:12:09 +0200, Laurent Bigonville wrote:
 
   Le Sat, 29 Sep 2012 20:56:11 +0200,
   Julien Cristau jcris...@debian.org a écrit :
  
   
why is the last bit needed?
   
 
  I didn't get a reply to the above (why you need adduser nut nut).

 See #493159

 This is to fix a situation were the user nut was not created without
 being added to the group. Is that correct Arnaud?


indeed, we have some corner cases due to the modular and distributed nature
of NUT:
you may install the CGI alone, to monitor remote installation, then install
nut (server | client ...) in the meantime, uninstall either ones, and still
requires the user and group to be there.


 
+if [ -d /var/run/nut ] ; then
+chown root:nut /var/run/nut
+chmod 770 /var/run/nut
+fi
   
why does the nut user need write access there?  And why is this
created in postinst instead of an init script?
  
   nut should be able to create sockets in that directory.
  
   This is probably a bit redundant as this is also done in the
   initscript.
  
  Then I'd prefer to not have it in postinst.

 Well this was a copy/paste of the nut-server postinstall script, so
 this should also be removed from that file too. Do you want me to do
 that for wheezy?


right, that's part of the legacy (dead) code, prior to the volatile /var
move.
good to remove, since it's addressed in the sysV initscript.
the question will probably pop-up again with systemd though!


 The maintainer scripts should probably reworked a bit,
 but that will be for later I guess.


yup, I'm still head underwater, concentrating on upstream lead :(
and the backlog for debs is still huge, though Laurent's help has made a
big difference in the past couple of years...

cheers,
Arnaud
-- 
Linux / Unix / Opensource Engineering Expert - Eaton -
http://opensource.eaton.com
Network UPS Tools (NUT) Project Leader - http://www.networkupstools.org
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.fr


Bug#684732: unblock: nut/2.6.4-2

2012-11-11 Thread Julien Cristau
One more question...

On Mon, Aug 13, 2012 at 15:36:14 +0200, Laurent Bigonville wrote:

 +for file in nut.conf upsmon.conf upssched.conf ; do
 +if [ -f /etc/nut/$file ] ; then
 +chown root:nut /etc/nut/$file
 +chmod 640 /etc/nut/$file
 +fi
 +done

why is this is done unconditionally on postinst configure, instead of
just on first install?

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-11-11 Thread Julien Cristau
On Sat, Sep 29, 2012 at 21:12:09 +0200, Laurent Bigonville wrote:

 Le Sat, 29 Sep 2012 20:56:11 +0200,
 Julien Cristau jcris...@debian.org a écrit :
 
  
  why is the last bit needed?
  

I didn't get a reply to the above (why you need adduser nut nut).

  +if [ -d /var/run/nut ] ; then
  +chown root:nut /var/run/nut
  +chmod 770 /var/run/nut
  +fi
  
  why does the nut user need write access there?  And why is this
  created in postinst instead of an init script?
 
 nut should be able to create sockets in that directory.
 
 This is probably a bit redundant as this is also done in the initscript.
 
Then I'd prefer to not have it in postinst.

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-11-11 Thread Laurent Bigonville
Le Sun, 11 Nov 2012 19:06:52 +0100,
Julien Cristau jcris...@debian.org a écrit :

 One more question...
 
 On Mon, Aug 13, 2012 at 15:36:14 +0200, Laurent Bigonville wrote:
 
  +for file in nut.conf upsmon.conf upssched.conf ; do
  +if [ -f /etc/nut/$file ] ; then
  +chown root:nut /etc/nut/$file
  +chmod 640 /etc/nut/$file
  +fi
  +done
 
 why is this is done unconditionally on postinst configure, instead of
 just on first install?

These files could contains passwords, I guess that this is done to be
really sure the files are not world readable? Arnaud?

Laurent Bigonville


signature.asc
Description: PGP signature


Bug#684732: unblock: nut/2.6.4-2

2012-11-11 Thread Laurent Bigonville
Le Sun, 11 Nov 2012 19:07:46 +0100,
Julien Cristau jcris...@debian.org a écrit :

 On Sat, Sep 29, 2012 at 21:12:09 +0200, Laurent Bigonville wrote:
 
  Le Sat, 29 Sep 2012 20:56:11 +0200,
  Julien Cristau jcris...@debian.org a écrit :
  
   
   why is the last bit needed?
   
 
 I didn't get a reply to the above (why you need adduser nut nut).

See #493159

This is to fix a situation were the user nut was not created without
being added to the group. Is that correct Arnaud?

 
   +if [ -d /var/run/nut ] ; then
   +chown root:nut /var/run/nut
   +chmod 770 /var/run/nut
   +fi
   
   why does the nut user need write access there?  And why is this
   created in postinst instead of an init script?
  
  nut should be able to create sockets in that directory.
  
  This is probably a bit redundant as this is also done in the
  initscript.
  
 Then I'd prefer to not have it in postinst.

Well this was a copy/paste of the nut-server postinstall script, so
this should also be removed from that file too. Do you want me to do
that for wheezy? The maintainer scripts should probably reworked a bit,
but that will be for later I guess.

Laurent Bigonville


signature.asc
Description: PGP signature


Bug#684732: unblock: nut/2.6.4-2

2012-09-29 Thread Julien Cristau
On Mon, Aug 13, 2012 at 15:36:14 +0200, Laurent Bigonville wrote:

 Package: release.debian.org
 Severity: normal
 User: release.debian@packages.debian.org
 Usertags: unblock
 
 Hi,
 
 Please unblock package nut
 
+if ! getent group nut /dev/null; then
+  addgroup --quiet --system nut
+fi
+if ! getent passwd nut /dev/null; then
+  adduser --quiet --system --ingroup nut --home /var/lib/nut 
--no-create-home nut
+elif ! groups nut | grep -qw nut; then
+  adduser nut nut
+fi

why is the last bit needed?

+if [ -d /var/run/nut ] ; then
+chown root:nut /var/run/nut
+chmod 770 /var/run/nut
+fi

why does the nut user need write access there?  And why is this created
in postinst instead of an init script?

Cheers,
Julien


signature.asc
Description: Digital signature


Bug#684732: unblock: nut/2.6.4-2

2012-09-29 Thread Laurent Bigonville
Le Sat, 29 Sep 2012 20:56:11 +0200,
Julien Cristau jcris...@debian.org a écrit :

 
 why is the last bit needed?
 
 +if [ -d /var/run/nut ] ; then
 +chown root:nut /var/run/nut
 +chmod 770 /var/run/nut
 +fi
 
 why does the nut user need write access there?  And why is this
 created in postinst instead of an init script?

nut should be able to create sockets in that directory.

This is probably a bit redundant as this is also done in the initscript.

Cheers

Laurent Bigonville


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120929211209.0e59b...@fornost.bigon.be



Bug#684732: unblock: nut/2.6.4-2

2012-08-13 Thread Laurent Bigonville
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Hi,

Please unblock package nut

This upload fixes several RC bugs and should make the package fit for
the upcoming release.

nut (2.6.4-2) unstable; urgency=low

  * debian/rules: Stop the nut-client before nut-server on systems using static
boot ordering (Closes: #679451)
  * debian/nut-server.postinst: Remove /etc/init.d/nut on upgrade
(Closes: #677822)
  * Rename nut-server.lintian-overrides to nut-client.lintian-overrides and
adjust overrides now that ups-monitor is shipped in nut-client package
(Closes: #677947)
  * Add debian/patches/0001-fix-upsmon-regression.patch: Fix upsmon/upssched
regression (Taken from upstream) (Closes: #679513)
  * Move nut metapackage to Section: metapackages
  * Also create nut user when installing nut-client package and do not delete
it on purge anymore (Closes: #682000)
  * Drop /etc/default/nut → /etc/nut/nut.conf migration code, migration
happends before squeeze release and this was against policy to have a
maintainer script modifying a conffile in the first place (Closes: #684392)
  * Add dependency against adduser and lsb-base on nut-client package
  * Be sure that client is stopped before the server also when using
dependencies based boot
  * Fix package descriptions (Closes: #678068)
  * Also install /bin/upssched-cmd in nut-client package as this script is
referenced in default upssched.conf config file
  * debian/watch: Update watch file
  * Be sure that all maintainer scripts are returning 0 at their end

 -- Laurent Bigonville bi...@debian.org  Sun, 12 Aug 2012 20:38:52 +0200

 changelog|   28 
 control  |9 ++--
 gbp.conf |4 -
 nut-cgi.postrm   |1 
 nut-client.install   |1 
 nut-client.lintian-overrides |1 
 nut-client.postinst  |   63 
 nut-server.init  |2 
 nut-server.lintian-overrides |2 
 nut-server.postinst  |   68 ++-
 nut-server.postrm|7 ---
 nut-server.preinst   |9 
 patches/0001-fix-upsmon-regression.patch |   15 ++
 patches/series   |1 
 rules|4 -
 watch|2 
 16 files changed, 130 insertions(+), 87 deletions(-)

unblock nut/2.6.4-2

Cheers

Laurent Bigonville

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.4-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_BE.utf8, LC_CTYPE=fr_BE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


nut_wheezy.diff.gz
Description: GNU Zip compressed data