I've just uploaded emdebian-tools 1.4.3 to unstable to fix RC bug
#494622 and a debconf translation update (#492752).
http://incoming.debian.org/emdebian-tools_1.4.3_amd64.changes
The debdiff was posted to #494622 but there have been minor tweaks
during testing of 1.4.3. The changes were reviewed by Neil McGovern
during DebConf8. The final debdiff is attached.
Changelog:
emdebian-tools (1.4.3) unstable; urgency=low
* [INTL:sv] po-debconf file for emdebian-tools (Closes: #492752)
'svn merge -r 4580:4581'
* Remove mountall because it shuts down process 1 - without runlevels,
this means shut down the system. r4672+r4675 (superceded by r4711
which in turn is part of the fix for #494622 below).
* two suite scripts force installation of conflicting packages
(Closes: #494622) fix by dropping sysv-rc. Therefore complete the
implementation of the replacement for the perl update-rc.d script
from sysv-rc in shell across all suite scripts: r4711. Ensure
/etc/rc.d/ exists for shell update-rc.d support: r4699. Implement
shell replacement for update-rc.d: r4677 (this was the commit that
omitted to make the change across all suite scripts, requiring r4711).
* Implement fix for #491917 in history.php as well as the original
buildd.php
-- Neil Williams <codehelp@debian.org> Wed, 20 Aug 2008 14:57:11 +0100
I'd like to request a freeze exception for emdebian-tools 1.4.3 on the
basis of the RC bug fix and updated debconf translation, so that 1.4.3
can migrate into testing and be included in Lenny.
Thanks.
--
Neil Williams
=============
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/
diff -Nru emdebian-tools-1.4.1/buildd/history.php emdebian-tools-1.4.3/buildd/history.php
--- emdebian-tools-1.4.1/buildd/history.php 2008-07-23 23:22:10.000000000 +0100
+++ emdebian-tools-1.4.3/buildd/history.php 2008-08-20 14:55:10.000000000 +0100
@@ -110,6 +110,8 @@
{
# needs support for ARCH in the query string too.
$pkg = htmlspecialchars ($_GET['pkg']);
+ $pkg = preg_replace ('/\.+\/+/', "", $pkg);
+ $pkg = preg_replace ('/\//', "", $pkg);
$files = array ();
print "<h2>Package: $pkg</h2>";
print "<a href=\"index.php?log=#$pkg\">Back</a><br/>\n";
@@ -185,7 +187,7 @@
|| (! preg_match("/Successful build/", $contents)))
{
print "<td class=\"warn\">";
- print "<a href=\"?log=$safefile&pkg=$safepkg\">maybe failed</a>";
+ print "<a href=\"index.php?log=$safefile&pkg=$safepkg\">maybe failed</a>";
print "</td>\n";
$status = -1;
$numfail++;
diff -Nru emdebian-tools-1.4.1/debian/changelog emdebian-tools-1.4.3/debian/changelog
--- emdebian-tools-1.4.1/debian/changelog 2008-07-23 23:22:10.000000000 +0100
+++ emdebian-tools-1.4.3/debian/changelog 2008-08-20 15:45:36.000000000 +0100
@@ -1,3 +1,28 @@
+emdebian-tools (1.4.3) unstable; urgency=low
+
+ * [INTL:sv] po-debconf file for emdebian-tools (Closes: #492752)
+ 'svn merge -r 4580:4581'
+ * Remove mountall because it shuts down process 1 - without runlevels,
+ this means shut down the system. r4672+r4675 (superceded by r4711
+ which in turn is part of the fix for #494622 below).
+ * two suite scripts force installation of conflicting packages
+ (Closes: #494622) fix by dropping sysv-rc. Therefore complete the
+ implementation of the replacement for the perl update-rc.d script
+ from sysv-rc in shell across all suite scripts: r4711. Ensure
+ /etc/rc.d/ exists for shell update-rc.d support: r4699. Implement
+ shell replacement for update-rc.d: r4677 (this was the commit that
+ omitted to make the change across all suite scripts, requiring r4711).
+ * Implement fix for #491917 in history.php as well as the original
+ buildd.php
+
+ -- Neil Williams <codehelp@debian.org> Wed, 20 Aug 2008 14:57:11 +0100
+
+emdebian-tools (1.4.2) unstable; urgency=low
+
+ * Skip Emdebian changes in 1.4.2
+
+ -- Neil Williams <codehelp@debian.org> Mon, 11 Aug 2008 14:38:44 -0300
+
emdebian-tools (1.4.1) unstable; urgency=low
* PHP local file inclusion (Closes: #491917)
diff -Nru emdebian-tools-1.4.1/debian/copyright emdebian-tools-1.4.3/debian/copyright
--- emdebian-tools-1.4.1/debian/copyright 2008-07-23 23:22:10.000000000 +0100
+++ emdebian-tools-1.4.3/debian/copyright 2008-08-20 14:55:10.000000000 +0100
@@ -7,7 +7,8 @@
Files: *
Licence: GPL-3+
-Copyright: Copyright 2006-2007 Neil Williams <codehelp@debian.org>
+Copyright: Copyright 2006-2008 Neil Williams <codehelp@debian.org>
+ Copyright 2008 Hands.com Ltd <phil@hands.com>
Copyright 2006-2007 Wookey <wookey@debian.org>
Copyright 1998-2006 Craig Small <csmall@debian.org>
Copyright 1999-2003 Julian Gilbey <jdg@debian.org>
diff -Nru emdebian-tools-1.4.1/debian/emdebian-tools.install emdebian-tools-1.4.3/debian/emdebian-tools.install
--- emdebian-tools-1.4.1/debian/emdebian-tools.install 2008-07-23 23:22:10.000000000 +0100
+++ emdebian-tools-1.4.3/debian/emdebian-tools.install 2008-08-20 14:55:10.000000000 +0100
@@ -29,6 +29,7 @@
doc/man/empdebuild.1 ./usr/share/man/man1/
emdebhelper.mk ./usr/share/emdebian-tools/
pbuilder/empdebuild ./usr/sbin/
+pbuilder/update-rc.d ./usr/share/emdebian-tools/
pbuilder/emdebian.buildd ./usr/lib/emdebian-tools/
pbuilder/unstable ./usr/lib/emdebian-tools/
pbuilder/testing ./usr/lib/emdebian-tools/
diff -Nru emdebian-tools-1.4.1/debian/po/sv.po emdebian-tools-1.4.3/debian/po/sv.po
--- emdebian-tools-1.4.1/debian/po/sv.po 2008-07-23 23:22:10.000000000 +0100
+++ emdebian-tools-1.4.3/debian/po/sv.po 2008-08-20 14:55:10.000000000 +0100
@@ -1,25 +1,29 @@
+# translation of emdebian-tools_1.4.0_sv.po to Swedish
# Swedish translation of emdebian-tools.
# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# This file is distributed under the same license as the emdebian-tools package.
-# Daniel Nylander <po@danielnylander.se>, 2007, 2008.
#
+# Daniel Nylander <po@danielnylander.se>, 2007, 2008.
+# Martin Ågren <martin.agren@gmail.com>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: emdebian-tools\n"
+"Project-Id-Version: emdebian-tools_1.4.0_sv\n"
"Report-Msgid-Bugs-To: emdebian-tools@packages.debian.org\n"
"POT-Creation-Date: 2008-03-30 16:39+0100\n"
-"PO-Revision-Date: 2008-01-08 21:51+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"PO-Revision-Date: 2008-07-28 18:40+0200\n"
+"Last-Translator: Martin Ågren <martin.agren@gmail.com>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: string
#. Description
#: ../emdebian-tools.templates:1001
msgid "Subversion login to use on buildd.emdebian.org:"
-msgstr "Ditt Subversion-användarnamn att använda på buildd.emdebian.org:"
+msgstr "Ditt Subversion-användarnamn på buildd.emdebian.org:"
#. Type: string
#. Description
@@ -73,7 +77,7 @@
#. Description
#: ../emdebian-tools.templates:3001
msgid "Debian primary mirror:"
-msgstr ""
+msgstr "Primär Debianspegel:"
#. Type: select
#. Description
@@ -88,37 +92,36 @@
"defined on the DML page, must be available to use emdebian-tools. If a "
"primary mirror already exists in your sources, emdebian-tools will use that."
msgstr ""
+"emdebian-tools behöver kunna efterfråga apt-cache-data från "
+"en Debianspegel som stödjer alla korskompileringsarkitekturer - dessa "
+"förråd kallas \"primärspeglar\" i Debian. "
+"Om /etc/apt/sources.list inte innehåller någon primär Debianspegel, "
+"kommer standardspegeln endast användas av emdebian-tools: ftp.fr.debian.org. "
+"Om du föredrar att använda en närmre eller snabbare primärspegel, "
+"välj den här. "
+"Åtminstone en primärspegel, så som de definieras på DML-sidan, måste finnas "
+"tillgänglig för att emdebian-tools ska kunna användas. "
+"Om en primärspegel redan existerar i din sources.list, kommer emdebian-tools "
+"använda den."
#. Type: string
#. Description
#: ../emdebian-rootfs.templates:1001
-#, fuzzy
-#| msgid "Build directory for emdebian packages:"
msgid "Writable build directory for emdebian packages:"
-msgstr "Byggkatalog för emdebian-paket:"
+msgstr "Skrivbar byggkatalog för emdebian-paket:"
#. Type: string
#. Description
#: ../emdebian-rootfs.templates:1001
-#, fuzzy
-#| msgid ""
-#| "Either specify an existing Emdebian subversion tree (e.g. /home/user/"
-#| "emdebian/svn/target/) or specify the full path to a directory that can be "
-#| "used by the tools (emsource and emchain) as a build tree. If no directory "
-#| "is given, the tools will use a new top level directory tree for checkouts "
-#| "and downloads for compatibility with a chroot or automated build "
-#| "environment."
msgid ""
"Either specify an existing Emdebian subversion tree (e.g. /home/user/"
"emdebian/svn/target/) or specify the full path to a writable directory that "
"can be used by the tools (emsource and emchain) as a build tree."
msgstr ""
-"Ange antingen ett befintligt Emdebian subversion-träd (t.ex. /home/"
+"Ange antingen ett befintligt Emdebian-subversion-träd (t. ex. /home/"
"användare/emdebian/svn/target/) eller ange den fullständiga sökvägen till en "
-"katalog som kan användas av verktygen (emsource och emchain) som ett "
-"byggträd. Om ingen katalog anges kommer verktygen att använda ett nytt "
-"toppnivåkatalogträd för utcheckningar och hämtningar med en chroot-aktiverad "
-"eller automatiserad byggmiljö."
+"skrivbar katalog som kan användas av verktygen (emsource och emchain) som ett "
+"byggträd."
#. Type: string
#. Description
@@ -128,12 +131,15 @@
"automated build environment where a new top level directory '/trunk/' would "
"be writable."
msgstr ""
+"Det tomma standardvärdet är bara avsett för kompatibilitet med en "
+"chroot-aktiverad eller automatiserad byggmiljö där en ny toppnivåkatalog \"/trunk/\" "
+"är skrivbar."
#. Type: select
#. Description
#: ../emdebian-rootfs.templates:2001
msgid "Which suite (e.g. unstable) should packages be built against?"
-msgstr "Vilken svit (t.ex. unstable) ska paketen byggas mot?"
+msgstr "Vilken svit (t.ex. den instabila utgåvan) ska paketen byggas mot?"
#. Type: select
#. Description
@@ -146,27 +152,8 @@
msgstr ""
"Den här inställningen bestämmer de versioner som bibliotek och paket "
"använder för att bygga korskompilerade emdebian-paket. standard för emdebian-"
-"tools är att ta dessa paket från unstable, (som i normala Debian-"
-"uppladdningar). Om du vill bygga mot testing eller stable istället kan du "
-"ändra denna inställning."
-
-#~ msgid "Specify a usable directory:"
-#~ msgstr "Ange en användbar katalog:"
-
-#~ msgid "Preferred working directory:"
-#~ msgstr "Föredragen arbetskatalog:"
-
-#~ msgid ""
-#~ "emsource can download, unpack and apply Emdebian patches to Debian "
-#~ "sources into the current working directory or into a preset working "
-#~ "directory. The same directory can also be used by emchain if you need to "
-#~ "build your own cross-building toolchain. If you would prefer to let "
-#~ "emsource and emchain work only in the current working directory, leave "
-#~ "this blank."
-#~ msgstr ""
-#~ "emsource kan hämta, packa upp och tillämpa programfixar för Emdebian till "
-#~ "Debian-källkoder i den aktuella arbetskatalogen eller i en förinställd "
-#~ "arbetskatalog. Samma katalog kan även användas av emchain om du behöver "
-#~ "bygga din egna cross-building toolchain. Om du föredrar att låta emsource "
-#~ "och emchain arbeta endast i den aktuella arbetskatalog ska du lämna denna "
-#~ "blank."
+"tools är att ta dessa paket från den instabila utgåvan (\"unstable\"), "
+"(som i normala Debian-uppladdningar). "
+"Om du vill bygga mot uttestnings- (\"testing\") eller den stabila utgåvan "
+"(\"stable\") istället kan du ändra denna inställning."
+
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.busybox emdebian-tools-1.4.3/pbuilder/emdebian.busybox
--- emdebian-tools-1.4.1/pbuilder/emdebian.busybox 2008-07-23 23:22:11.000000000 +0100
+++ emdebian-tools-1.4.3/pbuilder/emdebian.busybox 2008-08-20 14:55:11.000000000 +0100
@@ -25,7 +25,7 @@
base="apt gpgv debianutils makedev base-passwd sed mktemp
gnupg udev base-files debian-archive-keyring udhcpc udhcpd
- sysv-rc util-linux module-init-tools initscripts"
+ util-linux module-init-tools initscripts"
}
first_stage_install () {
@@ -39,7 +39,7 @@
basic_etc_fstab
basic_group_setup
basic_passwd_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
set_busybox_path
@@ -54,14 +54,6 @@
busybox_inittab
busybox_rcS
setup_devices
- symlink_rcS mountkernfs "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcS mountall.sh "25"
- symlink_rcS dbus "30"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.crossd emdebian-tools-1.4.3/pbuilder/emdebian.crossd
--- emdebian-tools-1.4.1/pbuilder/emdebian.crossd 2008-07-23 23:22:11.000000000 +0100
+++ emdebian-tools-1.4.3/pbuilder/emdebian.crossd 2008-08-20 14:55:11.000000000 +0100
@@ -26,7 +26,7 @@
base="apt gpgv libncurses5 libreadline5 readline-common mktemp
debianutils makedev whiptail gnupg udev base-files
- debian-archive-keyring dhcp3-client sysv-rc
+ debian-archive-keyring dhcp3-client
util-linux module-init-tools initscripts"
}
@@ -41,7 +41,7 @@
basic_etc_fstab
basic_group_setup
basic_passwd_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
provide_empty_install_info
@@ -55,13 +55,6 @@
busybox_inittab
busybox_rcS
setup_devices
- symlink_rcS mountkernfs "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcK mountall.sh "25"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.gpe emdebian-tools-1.4.3/pbuilder/emdebian.gpe
--- emdebian-tools-1.4.1/pbuilder/emdebian.gpe 2008-07-23 23:22:11.000000000 +0100
+++ emdebian-tools-1.4.3/pbuilder/emdebian.gpe 2008-08-20 14:55:11.000000000 +0100
@@ -48,7 +48,7 @@
basic_group_setup
basic_passwd_setup
basic_shadow_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
provide_empty_install_info
@@ -62,14 +62,6 @@
busybox_inittab
busybox_rcS
setup_devices
- symlink_rcS mountkernfs.sh "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcK mountall.sh "25"
- symlink_rcS dbus "30"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/emdebian.gtk emdebian-tools-1.4.3/pbuilder/emdebian.gtk
--- emdebian-tools-1.4.1/pbuilder/emdebian.gtk 2008-07-23 23:22:11.000000000 +0100
+++ emdebian-tools-1.4.3/pbuilder/emdebian.gtk 2008-08-20 14:55:11.000000000 +0100
@@ -40,7 +40,7 @@
basic_etc_fstab
basic_group_setup
basic_passwd_setup
- extra_etc_rcd
+ shell_update_rcd
set_approx_time
set_cdebconf_default
provide_empty_install_info
@@ -54,14 +54,6 @@
busybox_inittab
busybox_rcS
setup_devices
- symlink_rcS mountkernfs "02"
- symlink_rcS udev "10"
- symlink_rcS udev-mtab "11"
- symlink_rcS module-init-tools "15"
- symlink_rcS urandom "20"
- symlink_rcK mountall.sh "25"
- symlink_rcS dbus "30"
- symlink_rcS network "40"
info INSTCORE " -> First stage install complete in $BUILDPLACE"
}
diff -Nru emdebian-tools-1.4.1/pbuilder/empbuilderlib emdebian-tools-1.4.3/pbuilder/empbuilderlib
--- emdebian-tools-1.4.1/pbuilder/empbuilderlib 2008-07-23 23:22:11.000000000 +0100
+++ emdebian-tools-1.4.3/pbuilder/empbuilderlib 2008-08-20 14:55:11.000000000 +0100
@@ -579,3 +579,11 @@
function set_cdebconf_default () {
echo "export DEBCONF_USE_CDEBCONF=true" >> $BUILDPLACE/etc/profile
}
+
+function shell_update_rcd () {
+ if [ ! -e "$BUILDPLACE/usr/sbin/update-rc.d" ]; then
+ info INSTCORE "Adding a /usr/sbin/update-rc.d shell script"
+ cp /usr/share/emdebian-tools/update-rc.d $BUILDPLACE/usr/sbin/
+ chmod 0755 $BUILDPLACE/usr/sbin/update-rc.d
+ fi
+}
diff -Nru emdebian-tools-1.4.1/pbuilder/update-rc.d emdebian-tools-1.4.3/pbuilder/update-rc.d
--- emdebian-tools-1.4.1/pbuilder/update-rc.d 1970-01-01 01:00:00.000000000 +0100
+++ emdebian-tools-1.4.3/pbuilder/update-rc.d 2008-08-20 14:55:11.000000000 +0100
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Copyright 2008 Hands.com Ltd <phil@hands.com>
+# Copyright 2008 Neil Williams <codehelp@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+initd="/etc/init.d"
+etcd="/etc/rc.d"
+bn=$1;shift
+if [ "$bn" = '-f' ]; then
+ bn=$1
+ shift
+fi
+
+defaults () {
+ makelinks "S${1:-20}"
+ makelinks "K${2:-${1:-20}}"
+}
+
+makelinks () {
+ echo " Adding symlink for $initd/$bn ...";
+ echo "${etcd}/${1}${bn} -> ../init.d/$bn"
+ ln -s "../init.d/$bn" "${etcd}/${1}${bn}"
+}
+
+if [ -z "$bn" -o -z "$1" ]; then
+ echo "Insufficient arguments"
+ exit 1
+fi
+
+if [ ! -f "$initd/$bn" ]; then
+ echo "update-rc.d: $initd/$bn: file does not exist\n"
+ exit 1
+fi
+
+if [ "$1" = 'remove' ]; then
+ shift
+ echo "rm -f /etc/rc.d/*${bn}"
+ rm -f "/etc/rc.d/*${bn}"
+ exit;
+elif [ "$1" = 'defaults' ]; then
+ makelinks "S${2:-20}"
+ makelinks "K${3:-${2:-20}}"
+ exit 0;
+else
+ if [ "$1" = 'start' ]
+ then
+ # work here
+ shift
+ makelinks "S${1}"
+ while [ "$1" != "." ]
+ do
+ shift
+ done
+ shift
+ if [ "$1" = 'stop' ]; then
+ shift
+ makelinks "K${1}"
+ fi
+ fi
+ exit 0;
+fi
Attachment:
signature.asc
Description: This is a digitally signed message part