diff -Nru debian-installer-utils-1.105ubuntu1/chroot-setup.sh debian-installer-utils-1.109ubuntu1/chroot-setup.sh --- debian-installer-utils-1.105ubuntu1/chroot-setup.sh 2013-05-22 16:09:42.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/chroot-setup.sh 2014-11-18 15:29:53.000000000 +0000 @@ -119,7 +119,7 @@ # Some packages (eg. the kernel-image package) require a mounted # /proc/. Only mount it if not mounted already if [ ! -f /target/proc/cmdline ]; then - mount -t procfs proc /target/proc + mount -t linprocfs proc /target/proc fi # Some package might need sysfs mounted # Only mount it if not mounted already diff -Nru debian-installer-utils-1.105ubuntu1/debian/changelog debian-installer-utils-1.109ubuntu1/debian/changelog --- debian-installer-utils-1.105ubuntu1/debian/changelog 2014-02-12 12:21:40.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/debian/changelog 2014-11-18 15:34:05.000000000 +0000 @@ -1,3 +1,54 @@ +debian-installer-utils (1.109ubuntu1) vivid; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - user-params: Don't propagate vga=*, break=*, *-ubiquity, or + noninteractive to installed system. + - list-devices: + + New "mmc-partition" type for detecting partitions on MMC devices. + + Make sure we also detect platform-omap MMCs. + + Don't return entries for extended partitions. + - Don't include the battery subsystem on calls to udevadm trigger. + - log-output: Always install a no-op SIGCHLD handler, in case the + subsidiary process starts a daemon which does not fully disconnect its + standard file descriptors. + + -- Colin Watson Tue, 18 Nov 2014 15:34:00 +0000 + +debian-installer-utils (1.109) unstable; urgency=medium + + [ Ian Campbell ] + * Accept "---" as user-params separator in addition to "--" (Closes: #762007) + + -- Christian Perrier Sat, 11 Oct 2014 07:41:14 +0200 + +debian-installer-utils (1.108) unstable; urgency=low + + [ Updated translations ] + * Danish (da.po) by Joe Hansen + + -- Christian Perrier Wed, 10 Sep 2014 13:58:20 +0200 + +debian-installer-utils (1.107) unstable; urgency=medium + + [ Steven Chamberlain ] + * Fix procfs mounting on GNU/kFreeBSD: it's called linprocfs, rather + than procfs (Closes: #696901). + + -- Christian Perrier Thu, 22 May 2014 06:51:08 +0200 + +debian-installer-utils (1.106) unstable; urgency=high + + [ Wouter Verhelst ] + * resolv.c: move here from partman-nbd, and install into di-utils. + + [ Colin Watson ] + * Revert change in 1.103 to install no-op SIGCHLD handler even outside the + --pass-stdout case, since if a process daemonises without closing its + standard file descriptors and then tries to write to them it will + receive SIGPIPE, and that breaks speech synthesis in d-i (see #739989). + + -- Colin Watson Tue, 25 Feb 2014 00:12:49 +0000 + debian-installer-utils (1.105ubuntu1) trusty; urgency=medium * Resynchronise with Debian. Remaining changes: diff -Nru debian-installer-utils-1.105ubuntu1/debian/di-utils.install debian-installer-utils-1.109ubuntu1/debian/di-utils.install --- debian-installer-utils-1.105ubuntu1/debian/di-utils.install 2011-01-19 00:17:23.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/debian/di-utils.install 2014-11-18 15:29:53.000000000 +0000 @@ -13,3 +13,4 @@ chroot-setup.sh lib post-base-installer.d usr/lib fetch-url-methods/* usr/lib/fetch-url +resolv bin diff -Nru debian-installer-utils-1.105ubuntu1/debian/po/da.po debian-installer-utils-1.109ubuntu1/debian/po/da.po --- debian-installer-utils-1.105ubuntu1/debian/po/da.po 2011-10-18 17:16:34.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/debian/po/da.po 2014-11-18 15:29:53.000000000 +0000 @@ -6,6 +6,8 @@ # translation of debian-installer_packages_po_sublevel1_da.po to # Danish messages for debian-installer. # This file is distributed under the same license as debian-installer. +# Joe Hansen , 2011, 2012, 2013, 2014. +# Ask Hjorth Larsen , 2010. # Mads Bille Lundby , 2008. # Jesper Dahl Nyerup , 2008. @@ -15,14 +17,31 @@ # # Volume er oversat til diskenhed. Ret hvis Dansk-gruppen finder en anbefaling. # +# Translations from iso-codes: +# Alastair McKinstry , 2001. +# Claus Hindsgaul , 2006. +# Claus Hindsgaul , 2004, 2005, 2006. +# Computeroversættelse Tobias Toedter , 2007. +# Copyright (C) Free Software Foundation, Inc., 2006. +# Frederik 'Freso' S. Olesen , 2008. +# Free Software Foundation, Inc., 2000, 2004, 2005. +# Joe Hansen , 2009, 2010, 2011. +# Keld Simonsen , 2000, 2001. +# Kenneth Christiansen , 2000. +# Ole Laursen , 2001. +# +# vedrørende russisk: +# (bogstavet й bliver normalt til j på dansk og y på engelsk. Der er +# også nogle forskelle med de mange s/sh-agtige lyde) +# msgid "" msgstr "" "Project-Id-Version: debian-installer_packages_po_sublevel1_da\n" "Report-Msgid-Bugs-To: debian-installer-utils@packages.debian.org\n" "POT-Creation-Date: 2009-07-02 20:15+0000\n" -"PO-Revision-Date: 2010-09-12 05:44+0100\n" -"Last-Translator: Anders Jenbo \n" -"Language-Team: \n" +"PO-Revision-Date: 2014-08-10 20:20+0200\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +63,7 @@ #. :sl2: #: ../di-utils-shell.templates:1001 msgid "After this message, you will be running \"ash\", a Bourne-shell clone." -msgstr "Efter denne besked kører du \"ash\", en klon af Bourne-skallen." +msgstr "Efter denne besked kører du »ash«, en klon af Bourne-skallen." #. Type: note #. Description @@ -56,17 +75,17 @@ "easy to figure out. To get an idea of what Unix utilities are available to " "you, use the \"help\" command." msgstr "" -"Rodfilsystemet er en ramdisk. Harddisk-filsystemerne er monteret på \"/target" -"\". Den tilgængelige tekstbehandler hedder nano. Den er meget lille og nem " -"at finde ud af. For at få en idé om, hvilke Unix-værktøjer, du har til " -"rådighed, kan du bruge kommandoen \"help\"." +"Rodfilsystemet er en ramdisk. Harddisk-filsystemerne er monteret på »/" +"target«. Den tilgængelige tekstbehandler hedder nano. Den er meget lille og " +"nem at finde ud af. For at få en idé om, hvilke Unix-værktøjer, du har til " +"rådighed, kan du bruge kommandoen »help«." #. Type: note #. Description #. :sl2: #: ../di-utils-shell.templates:1001 msgid "Use the \"exit\" command to return to the installation menu." -msgstr "Brug kommandoen \"exit\" for at komme tilbage til installationsmenuen." +msgstr "Brug kommandoen »exit« for at komme tilbage til installationsmenuen." #. Type: text #. Description @@ -150,8 +169,8 @@ "It should be available after reaching the \"Loading additional components\" " "installation step." msgstr "" -"Den skulle være tilgængelig, når installationen når til trinnet \"Indlæsning " -"af yderligere komponenter\"." +"Den skulle være tilgængelig, når installationen når til trinnet »Indlæsning " +"af yderligere komponenter«." #. Type: text #. Description diff -Nru debian-installer-utils-1.105ubuntu1/debian/po/et.po debian-installer-utils-1.109ubuntu1/debian/po/et.po --- debian-installer-utils-1.105ubuntu1/debian/po/et.po 2012-06-21 09:18:38.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/debian/po/et.po 2014-11-18 15:29:53.000000000 +0000 @@ -24,7 +24,7 @@ # Margus Väli , 2000. # Siim Põder , 2006. # Tõivo Leedjärv , 2000, 2001, 2008. -# Mattias Põldaru , 2009-2011, 2012. +# Mattias Põldaru , 2009-2012, 2014. # msgid "" msgstr "" @@ -37,7 +37,7 @@ "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" #. Type: note diff -Nru debian-installer-utils-1.105ubuntu1/debian/po/it.po debian-installer-utils-1.109ubuntu1/debian/po/it.po --- debian-installer-utils-1.105ubuntu1/debian/po/it.po 2011-10-18 17:16:34.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/debian/po/it.po 2014-11-18 15:29:53.000000000 +0000 @@ -4,7 +4,7 @@ # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST # # Italian messages for debian-installer. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Software in the Public Interest, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2103, 2014 Software in the Public Interest, Inc. # This file is distributed under the same license as debian-installer. # The translation team (for all four levels): # Cristian Rigamonti @@ -13,7 +13,7 @@ # Davide Viti # Filippo Giunchedi # Giuseppe Sacco -# Lorenzo 'Maxxer' Milesi +# Lorenzo 'Maxxer' Milesi # Renato Gini # Ruggero Tonelli # Samuele Giovanni Tonon @@ -32,7 +32,7 @@ # Marcello Raffa , 2001 # Tobias Toedter , 2007. # Translations taken from ICU SVN on 2007-09-09 -# Milo Casagrande , 2008, 2009, 2010, 2011. +# Milo Casagrande , 2008, 2009, 2010, 2011, 2012, 2013, 2014. # msgid "" msgstr "" @@ -40,13 +40,13 @@ "Report-Msgid-Bugs-To: debian-installer-utils@packages.debian.org\n" "POT-Creation-Date: 2009-07-02 20:15+0000\n" "PO-Revision-Date: 2011-08-21 18:53+0200\n" -"Last-Translator: Milo Casagrande \n" +"Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #. Type: note #. Description diff -Nru debian-installer-utils-1.105ubuntu1/Makefile debian-installer-utils-1.109ubuntu1/Makefile --- debian-installer-utils-1.105ubuntu1/Makefile 2012-11-22 02:35:59.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/Makefile 2014-11-18 15:29:53.000000000 +0000 @@ -1,5 +1,5 @@ ifndef TARGETS -TARGETS=mapdevfs log-output +TARGETS=mapdevfs log-output resolv endif CFLAGS=-Wall -W -Os -fomit-frame-pointer -g @@ -15,6 +15,8 @@ log-output: log-output.c $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -ldebian-installer +resolv: resolv.c + strip: $(TARGETS) $(STRIP) $^ diff -Nru debian-installer-utils-1.105ubuntu1/resolv.c debian-installer-utils-1.109ubuntu1/resolv.c --- debian-installer-utils-1.105ubuntu1/resolv.c 1970-01-01 00:00:00.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/resolv.c 2014-11-18 15:29:53.000000000 +0000 @@ -0,0 +1,48 @@ +#include +#include +#include +#include +#include +#include +#include + +int main(int ac, char**av) { + int i; + struct addrinfo *res, *rp; + struct addrinfo hints; + char host[NI_MAXHOST]; + int e; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + for(i=1;iai_next) { + struct sockaddr_in* in4; + struct sockaddr_in6* in6; + void* addr; + + switch(rp->ai_family) { + case AF_INET: + in4 = (struct sockaddr_in*)rp->ai_addr; + addr = &(in4->sin_addr); + break; + case AF_INET6: + in6 = (struct sockaddr_in6*)rp->ai_addr; + addr = &(in6->sin6_addr); + break; + default: + continue; + } + inet_ntop(rp->ai_family, addr, host, sizeof(host)); + printf("%s\n", host); + } + } + if(res)freeaddrinfo(res); + } + return 0; +} diff -Nru debian-installer-utils-1.105ubuntu1/user-params debian-installer-utils-1.109ubuntu1/user-params --- debian-installer-utils-1.105ubuntu1/user-params 2011-01-19 00:17:23.000000000 +0000 +++ debian-installer-utils-1.109ubuntu1/user-params 2014-11-18 15:29:53.000000000 +0000 @@ -14,7 +14,7 @@ # Remove trailing '?' for debconf variables set with '?=' var="${var%\?}" - if [ "$item" = "--" ]; then + if [ "$item" = "--" ] || [ "$item" = "---" ]; then inuser=1 collect="" elif [ "$inuser" ]; then