Re: RC Bugfix #605868: please unblock sbox-dtc
On 12/05/2010 01:26 AM, Thomas Goirand wrote:
> Hi,
>
> Here's the changelog:
>
> * Now using my @debian email address as maintainer.
> * Sets the SUID bit, chown sbox to root.root (Closse: #605868).
> * Added Danish debconf translation, thanks to Joe Dalton
> <joedalton2@yahoo.dk> (Closes: #583972).
>
> Please allow this go get into Squeeze. Interdiff attached.
>
> Thomas Goirand (zigo)
I have uploaded a new version of the package, because my last upload
introduced some issues (the postinst was touching the wrong nonexistent
file). Interdiff is attached. Please unblock sbox-dtc 1.11.2-4.
Thomas
diff -u sbox-dtc-1.11.2/debian/changelog sbox-dtc-1.11.2/debian/changelog
--- sbox-dtc-1.11.2/debian/changelog
+++ sbox-dtc-1.11.2/debian/changelog
@@ -1,3 +1,29 @@
+sbox-dtc (1.11.2-4) unstable; urgency=low
+
+ * Fixed the postinst that was manipulating the wrong /etc/logrotate.d
+ file (Closes: #606603).
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 10 Dec 2010 23:11:11 +0800
+
+sbox-dtc (1.11.2-3) unstable; urgency=low
+
+ * Uses useradd -M instead -m. eg: do not create home dir for the sbox-dtc
+ user (Closes: #605980).
+ * Deletes /etc/sbox.conf and /var/log/sbox.log in the postrm script when
+ purging package.
+ * Added a logrotate weekly script.
+
+ -- Thomas Goirand <zigo@debian.org> Mon, 06 Dec 2010 00:03:43 +0800
+
+sbox-dtc (1.11.2-2) unstable; urgency=low
+
+ * Now using my @debian email address as maintainer.
+ * Sets the SUID bit, chown sbox to root.root (Closse: #605868).
+ * Added Danish debconf translation, thanks to Joe Dalton
+ <joedalton2@yahoo.dk> (Closes: #583972).
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 04 Dec 2010 16:47:31 +0800
+
sbox-dtc (1.11.2-1) unstable; urgency=low
* Bumped Standard-Version
diff -u sbox-dtc-1.11.2/debian/control sbox-dtc-1.11.2/debian/control
--- sbox-dtc-1.11.2/debian/control
+++ sbox-dtc-1.11.2/debian/control
@@ -1,7 +1,7 @@
Source: sbox-dtc
Section: web
Priority: extra
-Maintainer: Thomas Goirand <thomas@goirand.fr>
+Maintainer: Thomas Goirand <zigo@debian.org>
Build-Depends: debhelper (>= 5), libapr1-dev, libdotconf-dev, po-debconf
Standards-Version: 3.8.4
Dm-Upload-Allowed: yes
diff -u sbox-dtc-1.11.2/debian/rules sbox-dtc-1.11.2/debian/rules
--- sbox-dtc-1.11.2/debian/rules
+++ sbox-dtc-1.11.2/debian/rules
@@ -35,6 +35,7 @@
dh_testroot
dh_installchangelogs
dh_installdocs
+ dh_installlogrotate
dh_install
dh_installdebconf
dh_strip
diff -u sbox-dtc-1.11.2/debian/postinst sbox-dtc-1.11.2/debian/postinst
--- sbox-dtc-1.11.2/debian/postinst
+++ sbox-dtc-1.11.2/debian/postinst
@@ -38,18 +38,24 @@
if getent passwd ${CONF_DTC_SYSTEM_USERNAME} >/dev/null ; then
echo "User ${CONF_DTC_SYSTEM_USERNAME} already exists: skiping creation!"
else
- useradd -m -s /bin/false -g ${CONF_DTC_SYSTEM_GROUPNAME} ${CONF_DTC_SYSTEM_USERNAME}
+ useradd -M -s /bin/false -g ${CONF_DTC_SYSTEM_GROUPNAME} ${CONF_DTC_SYSTEM_USERNAME}
fi
- searchAndReplace /etc/sbox.conf web_user\ www-data web_user\ dtc
- searchAndReplace /etc/sbox.conf web_group\ www-data web_group\ dtcgrp
- chown dtc:dtcgrp /usr/lib/cgi-bin/sbox
+ searchAndReplace /etc/sbox.conf web_user\ www-data web_user\ ${CONF_DTC_SYSTEM_USERNAME}
+ searchAndReplace /etc/sbox.conf web_group\ www-data web_group\ ${CONF_DTC_SYSTEM_GROUPNAME}
+ sed -i s/www-data/${CONF_DTC_SYSTEM_USERNAME}/ /etc/logrotate.d/sbox-dtc
+ sed -i s/www-data/${CONF_DTC_SYSTEM_GROUPNAME}/ /etc/logrotate.d/sbox-dtc
+ chown root:root /usr/lib/cgi-bin/sbox
chown ${CONF_DTC_SYSTEM_USERNAME}:${CONF_DTC_SYSTEM_GROUPNAME} /var/log/sbox.log
+ chmod u=+rws /usr/lib/cgi-bin/sbox
else
- searchAndReplace /etc/sbox.conf web_user\ dtc web_user\ www-data
- searchAndReplace /etc/sbox.conf web_group\ dtcgrp web_group\ www-data
- chown www-data:www-data /usr/lib/cgi-bin/sbox
+ searchAndReplace /etc/sbox.conf web_user\ ${CONF_DTC_SYSTEM_USERNAME} web_user\ www-data
+ searchAndReplace /etc/sbox.conf web_group\ ${CONF_DTC_SYSTEM_GROUPNAME} web_group\ www-data
+ sed -i s/${CONF_DTC_SYSTEM_USERNAME}/www-data/ /etc/logrotate.d/sbox-dtc
+ sed -i s/${CONF_DTC_SYSTEM_GROUPNAME}/www-data/ /etc/logrotate.d/sbox-dtc
+ chown root:root /usr/lib/cgi-bin/sbox
chown www-data:www-data /var/log/sbox.log
+ chmod u=+rws /usr/lib/cgi-bin/sbox
fi
#DEBHELPER#
only in patch2:
unchanged:
--- sbox-dtc-1.11.2.orig/debian/logrotate
+++ sbox-dtc-1.11.2/debian/logrotate
@@ -0,0 +1,8 @@
+/var/log/sbox.log {
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ create 640 www-data www-data
+}
only in patch2:
unchanged:
--- sbox-dtc-1.11.2.orig/debian/postrm
+++ sbox-dtc-1.11.2/debian/postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# Remove configuration if package is being purged
+if [ "$1" = "purge" ]; then
+ rm -f /etc/sbox.conf
+ rm -f /var/log/sbox.log
+fi
+
+#DEBHELPER#
+
+exit 0
only in patch2:
unchanged:
--- sbox-dtc-1.11.2.orig/debian/po/da.po
+++ sbox-dtc-1.11.2/debian/po/da.po
@@ -0,0 +1,41 @@
+# Danish translation sbox-dtc.
+# Copyright (C) 2010 sbox-dtc & nedenstående oversættere.
+# This file is distributed under the same license as the sbox-dtc package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sbox-dtc\n"
+"Report-Msgid-Bugs-To: sbox-dtc@packages.debian.org\n"
+"POT-Creation-Date: 2009-12-11 13:30+0800\n"
+"PO-Revision-Date: 2010-05-31 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Use dtc:dtcgrp for the sbox binary?"
+msgstr "Brug dtc:dtcgrp til den binære sbox?"
+
+# The chown command is used on Unix-like systems to change the owner of a file.
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Under Debian, apache runs under www-data:www-data. This is ok if running "
+"only apache, but if using sbox-dtc together with the DTC control panel, you "
+"need to have sbox chown to dtc:dtcgrp. In that case, you want create the dtc "
+"user and dtcgrp group, and chown the sbox binary to dtc:dtcgrp, otherwise "
+"you don't."
+msgstr ""
+"Under Debian kører apache under www-data:www.data. Det er okay, hvis der "
+"kun køres apache, men hvis sbox-dtc bruges sammen med panelprogrammet "
+"DTC control, skal du have sbox chown til dtc:dtcgrp. I det tilfælde vil "
+"du skulle oprette dtc-brugeren og dtcgrp-gruppen, og chown den binære sbox "
+"til dtc:dtcgrp, ellers ikke."
+
+
Reply to: