[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

RC Bugfix #605868: please unblock sbox-dtc



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)
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,12 @@
+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/postinst sbox-dtc-1.11.2/debian/postinst
--- sbox-dtc-1.11.2/debian/postinst
+++ sbox-dtc-1.11.2/debian/postinst
@@ -43,13 +43,15 @@
 
 	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
+	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
+	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/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: