Bug#592550: String freeze for Debian Installer

2012-04-25 Thread Christian PERRIER 
Quoting Charles Plessy (ple...@debian.org):
 Le Sat, Apr 21, 2012 at 04:13:53PM +0200, Christian PERRIER a écrit :
 
  Even if not very important, I recommend avoiding interrogative form in
  the long part.
 
  Add a comment for translators and move to sublevel 6
 
 Thanks for the proofreading.  I attached an additional patch that can be
 applied on top of the other ones.
 
 I have the impression that I may have confused you by sending a stack of
 interdependant patches in my previous email.  If you are not going to apply
 them with the 'git am' command, I attached a monolithic patch as a
 replacement

I just committed the patch. THanks for your work on this!




signature.asc
Description: Digital signature

Re: Bug#592550: String freeze for Debian Installer

2012-04-23 Thread Lennart Sorensen 
On Sat, Apr 21, 2012 at 04:13:53PM +0200, Christian PERRIER wrote:
 Even if not very important, I recommend avoiding interrogative form in
 the long part.
 
 So, I'd rephrase to:
 
 Template: network-console/authorized_keys_url
 Type: string
 Description: for internal use; can be preseeded
  This variable container the URL that provides a list of authorized

Should that be 'This variable contains ...'?

  SSH public keys.

-- 
Len Sorensen


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/20120423155121.go10...@caffeine.csclub.uwaterloo.ca

Re: Bug#592550: String freeze for Debian Installer

2012-04-23 Thread Christian Perrier 

Lennart Sorensen a écrit :

On Sat, Apr 21, 2012 at 04:13:53PM +0200, Christian PERRIER wrote:

Even if not very important, I recommend avoiding interrogative form in
the long part.

So, I'd rephrase to:

Template: network-console/authorized_keys_url
Type: string
Description: for internal use; can be preseeded
 This variable container the URL that provides a list of authorized


Should that be 'This variable contains ...'?



Sure. Typo of mine. Not the first one...and not the last one..:-)


--
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/4f957b49.8050...@debian.org

Bug#592550: String freeze for Debian Installer

2012-04-23 Thread Charles Plessy 
Le Sat, Apr 21, 2012 at 04:13:53PM +0200, Christian PERRIER a écrit :

 Even if not very important, I recommend avoiding interrogative form in
 the long part.

 Add a comment for translators and move to sublevel 6

Thanks for the proofreading.  I attached an additional patch that can be
applied on top of the other ones.

I have the impression that I may have confused you by sending a stack of
interdependant patches in my previous email.  If you are not going to apply
them with the 'git am' command, I attached a monolithic patch as a replacement.

Have a nice day,

-- 
Charles Plessy
Tsurumi, Kanagawa, Japan
From d1399b53ba3d7ec41fb39cb2e64834d89d973308 Mon Sep 17 00:00:00 2001
From: Charles Plessy ple...@debian.org
Date: Tue, 24 Apr 2012 09:37:12 +0900
Subject: [PATCH 5/5] Proofread by C. Perrier.

Message-ID: 20120421141353.gb3...@mykerinos.kheops.frmug.org
---
 debian/network-console.templates |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/network-console.templates b/debian/network-console.templates
index 26c19fa..40e056a 100644
--- a/debian/network-console.templates
+++ b/debian/network-console.templates
@@ -79,14 +79,14 @@ _Description: Start SSH
 Template: network-console/authorized_keys_url
 Type: string
 Description: for internal use; can be preseeded
- URL to a list of authorized SSH public keys.
- .
- The file at the given URL should be of the same form as a standard SSH
- authorized_keys file.
+ This variable contains the URL that provides a list of authorized
+ SSH public keys 
 
 Template: network-console/authorized_keys_fetch_failure
 Type: error
 # :sl6:
+#flag:comment:2
+# Translators: do NOT translate the LOCATION variable name
 _Description: Could not fetch SSH authorized keys
  An error occurred while fetching SSH authorized keys from ${LOCATION}.
  .
-- 
1.7.9.5

diff --git a/debian/changelog b/debian/changelog
index 43ac6c4..82cce35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+network-console (1.31) UNRELEASED; urgency=low
+
+  [ Matt T. Proud ]
+  * Add support for public-key authentication (Closes:#592550, LP: #184108).
+
+  [ Charles Plessy ]
+  * Mark authorized_keys_fetch_failure for translation, sublevel 6.
+
+ -- Charles Plessy ple...@debian.org  Sat, 21 Apr 2012 12:22:26 +0900
+
 network-console (1.30) unstable; urgency=low
 
   [ Updated translations ]
diff --git a/debian/network-console.postinst b/debian/network-console.postinst
index c5c0560..cbfe825 100755
--- a/debian/network-console.postinst
+++ b/debian/network-console.postinst
@@ -26,7 +26,30 @@ case $ARCHDETECT in
 	;;
 esac
 
-while [ -z $PASSWORD ]; do
+db_get $TEMPLATE_ROOT/authorized_keys_url
+
+AUTHORIZED_KEYS_URL=$RET
+AUTHORIZED_KEYS_DIRECTORY=/.ssh
+AUTHORIZED_KEYS_FILE=$AUTHORIZED_KEYS_DIRECTORY/authorized_keys
+
+if [ -n $AUTHORIZED_KEYS_URL ]; then
+	if [ ! -f $AUTHORIZED_KEYS_FILE ]; then
+		[ -d $AUTHORIZED_KEYS_DIRECTORY ] || \
+		mkdir $AUTHORIZED_KEYS_DIRECTORY
+		chmod 0700 $AUTHORIZED_KEYS_DIRECTORY
+		if ! wget -q $AUTHORIZED_KEYS_URL -O $AUTHORIZED_KEYS_FILE; then
+			db_subst $TEMPLATE_ROOT/authorized_keys_fetch_failure \
+			LOCATION $AUTHORIZED_KEYS_URL
+			db_input critical $TEMPLATE_ROOT/authorized_keys_fetch_failure \
+			|| true
+			db_go
+			exit 1
+		fi
+		chmod 0644 $AUTHORIZED_KEYS_FILE || true
+	fi
+fi
+
+while [ ! -f $AUTHORIZED_KEYS_FILE ]  [ -z $PASSWORD ]; do
 	db_input critical $TEMPLATE_ROOT/password || true
 	COMPARE_PW=''
 	db_input high $TEMPLATE_ROOT/password-again  COMPARE_PW=1 || true
diff --git a/debian/network-console.templates b/debian/network-console.templates
index 4439379..40e056a 100644
--- a/debian/network-console.templates
+++ b/debian/network-console.templates
@@ -75,3 +75,19 @@ _Description: Start SSH
  .
  Please check this carefully against the fingerprint reported by
  your SSH client.
+
+Template: network-console/authorized_keys_url
+Type: string
+Description: for internal use; can be preseeded
+ This variable contains the URL that provides a list of authorized
+ SSH public keys 
+
+Template: network-console/authorized_keys_fetch_failure
+Type: error
+# :sl6:
+#flag:comment:2
+# Translators: do NOT translate the LOCATION variable name
+_Description: Could not fetch SSH authorized keys
+ An error occurred while fetching SSH authorized keys from ${LOCATION}.
+ .
+ Check /var/log/syslog or see virtual console 4 for the details.

Bug#592550: String freeze for Debian Installer

2012-04-23 Thread Christian PERRIER 
Quoting Charles Plessy (ple...@debian.org):

 Thanks for the proofreading.  I attached an additional patch that can be
 applied on top of the other ones.
 
 I have the impression that I may have confused you by sending a stack of
 interdependant patches in my previous email.  If you are not going to apply
 them with the 'git am' command, I attached a monolithic patch as a
 replacement

This patch is fine by me. Any objections from someone else in what
remains of D-I team?




signature.asc
Description: Digital signature

Bug#592550: String freeze for Debian Installer

2012-04-21 Thread Christian PERRIER 
Quoting Charles Plessy (ple...@debian.org):
 Le Wed, Apr 04, 2012 at 06:51:37PM +0200, Christian PERRIER a écrit :
  
  I propose you use sublevel 6.
  
  Then update the patch...then propose a patch to the D-I documentation
  (the part about preseeding as any preseedable value should be
  documented there).
 
 Dear Christian and everybody,
 
 here is an updated patch to network-console, to implement SSH connection via
 authorized keys downloaded at run time.

Thanks Charles,

Review added to my TODO list for this week-end. Please yell if I
didn't answer by Sunday evening (european time).




signature.asc
Description: Digital signature

Re: Bug#592550: String freeze for Debian Installer

2012-04-21 Thread Christian PERRIER 
Quoting Charles Plessy (ple...@debian.org):

 +Template: network-console/authorized_keys_url
 +Type: string
 +Description: for internal use; can be preseeded
 + What URL contains a list of authorized SSH public keys?

 + The file at the given URL should be of the same form as a standard OpenSSH
 + authorized_keys file.
Even if not very important, I recommend avoiding interrogative form in
the long part.

So, I'd rephrase to:

Template: network-console/authorized_keys_url
Type: string
Description: for internal use; can be preseeded
 This variable container the URL that provides a list of authorized
 SSH public keys.



 +
 +Template: network-console/authorized_keys_fetch_failure
 +Type: error
 +# should be translated when committed upstream
 +Description: Could not fetch OpenSSH authorized keys
 + An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
 + .
 + Check /var/log/syslog or see virtual console 4 for the details.
 -- 
 1.7.9.5
 

Add a comment for translators and move to sublevel 6

Template: network-console/authorized_keys_fetch_failure
Type: error
# :sl6:
#flag:comment:2
# Translators: do NOT translate the LOCATION variable name
Description: Could not fetch OpenSSH authorized keys
 An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
 .
 Check /var/log/syslog or see virtual console 4 for the details.


  
  Template: network-console/authorized_keys_fetch_failure
  Type: error
 -# should be translated when committed upstream
 -Description: Could not fetch OpenSSH authorized keys
 +# :sl6:
 +_Description: Could not fetch OpenSSH authorized keys
   An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
   .
   Check /var/log/syslog or see virtual console 4 for the details.

Template: network-console/authorized_keys_fetch_failure
Type: error
# :sl6:
#flag:comment:2
# Translators: do NOT translate the LOCATION variable name
_Description: Could not fetch OpenSSH authorized keys
 An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
 .
 Check /var/log/syslog or see virtual console 4 for the details.



  Template: network-console/authorized_keys_url
  Type: string
  Description: for internal use; can be preseeded
 - What URL contains a list of authorized SSH public keys?
 + URL to a list of authorized SSH public keys.
   .
 - The file at the given URL should be of the same form as a standard OpenSSH
 + The file at the given URL should be of the same form as a standard SSH
   authorized_keys file.

Same changes suggested than above

  
  Template: network-console/authorized_keys_fetch_failure
  Type: error
  # :sl6:
 -_Description: Could not fetch OpenSSH authorized keys
 - An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
 +_Description: Could not fetch SSH authorized keys
 + An error occurred while fetching SSH authorized keys from ${LOCATION}.
   .
   Check /var/log/syslog or see virtual console 4 for the details.

Ditto.




signature.asc
Description: Digital signature

Bug#592550: String freeze for Debian Installer

2012-04-20 Thread Charles Plessy 
Le Wed, Apr 04, 2012 at 06:51:37PM +0200, Christian PERRIER a écrit :
 
 I propose you use sublevel 6.
 
 Then update the patch...then propose a patch to the D-I documentation
 (the part about preseeding as any preseedable value should be
 documented there).

Dear Christian and everybody,

here is an updated patch to network-console, to implement SSH connection via
authorized keys downloaded at run time.

I am still studying how to test the patched udeb...

I will submit a patch to the D-I documentation separately.  In the meantime,
please let me know if you spot a problem with the attached patches.

Have a nice week-end,

-- 
Charles Plessy
Tsurumi, Kanagawa, Japan
From a46062a72f680feebc78ff7a630ccb5765b478c1 Mon Sep 17 00:00:00 2001
From: Charles Plessy ple...@debian.org
Date: Sat, 21 Apr 2012 11:53:13 +0900
Subject: [PATCH 1/4] Add support for public-key authentication (Matt T.
 Proud, LP: #184108).

URL: http://patches.ubuntu.com/n/network-console/network-console_1.29ubuntu1.patch
---
 debian/network-console.postinst  |   25 -
 debian/network-console.templates |   16 
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/network-console.postinst b/debian/network-console.postinst
index c5c0560..cbfe825 100755
--- a/debian/network-console.postinst
+++ b/debian/network-console.postinst
@@ -26,7 +26,30 @@ case $ARCHDETECT in
 	;;
 esac
 
-while [ -z $PASSWORD ]; do
+db_get $TEMPLATE_ROOT/authorized_keys_url
+
+AUTHORIZED_KEYS_URL=$RET
+AUTHORIZED_KEYS_DIRECTORY=/.ssh
+AUTHORIZED_KEYS_FILE=$AUTHORIZED_KEYS_DIRECTORY/authorized_keys
+
+if [ -n $AUTHORIZED_KEYS_URL ]; then
+	if [ ! -f $AUTHORIZED_KEYS_FILE ]; then
+		[ -d $AUTHORIZED_KEYS_DIRECTORY ] || \
+		mkdir $AUTHORIZED_KEYS_DIRECTORY
+		chmod 0700 $AUTHORIZED_KEYS_DIRECTORY
+		if ! wget -q $AUTHORIZED_KEYS_URL -O $AUTHORIZED_KEYS_FILE; then
+			db_subst $TEMPLATE_ROOT/authorized_keys_fetch_failure \
+			LOCATION $AUTHORIZED_KEYS_URL
+			db_input critical $TEMPLATE_ROOT/authorized_keys_fetch_failure \
+			|| true
+			db_go
+			exit 1
+		fi
+		chmod 0644 $AUTHORIZED_KEYS_FILE || true
+	fi
+fi
+
+while [ ! -f $AUTHORIZED_KEYS_FILE ]  [ -z $PASSWORD ]; do
 	db_input critical $TEMPLATE_ROOT/password || true
 	COMPARE_PW=''
 	db_input high $TEMPLATE_ROOT/password-again  COMPARE_PW=1 || true
diff --git a/debian/network-console.templates b/debian/network-console.templates
index 4439379..58daa88 100644
--- a/debian/network-console.templates
+++ b/debian/network-console.templates
@@ -75,3 +75,19 @@ _Description: Start SSH
  .
  Please check this carefully against the fingerprint reported by
  your SSH client.
+
+Template: network-console/authorized_keys_url
+Type: string
+Description: for internal use; can be preseeded
+ What URL contains a list of authorized SSH public keys?
+ .
+ The file at the given URL should be of the same form as a standard OpenSSH
+ authorized_keys file.
+
+Template: network-console/authorized_keys_fetch_failure
+Type: error
+# should be translated when committed upstream
+Description: Could not fetch OpenSSH authorized keys
+ An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
+ .
+ Check /var/log/syslog or see virtual console 4 for the details.
-- 
1.7.9.5

From 2228ea565729b20691b2451af5743e331647d9e8 Mon Sep 17 00:00:00 2001
From: Charles Plessy ple...@debian.org
Date: Sat, 21 Apr 2012 12:17:31 +0900
Subject: [PATCH 2/4] Mark network-console/authorized_keys_fetch_failure for
 translation.

---
 debian/network-console.templates |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/network-console.templates b/debian/network-console.templates
index 58daa88..db8621d 100644
--- a/debian/network-console.templates
+++ b/debian/network-console.templates
@@ -86,8 +86,8 @@ Description: for internal use; can be preseeded
 
 Template: network-console/authorized_keys_fetch_failure
 Type: error
-# should be translated when committed upstream
-Description: Could not fetch OpenSSH authorized keys
+# :sl6:
+_Description: Could not fetch OpenSSH authorized keys
  An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
  .
  Check /var/log/syslog or see virtual console 4 for the details.
-- 
1.7.9.5

From 9ff20a125fc30d8b11e6fe10aa25f1f6bb9c9582 Mon Sep 17 00:00:00 2001
From: Charles Plessy ple...@debian.org
Date: Sat, 21 Apr 2012 12:22:05 +0900
Subject: [PATCH 3/4] Simplification of the authorized_keys* entries.

---
 debian/network-console.templates |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/network-console.templates b/debian/network-console.templates
index db8621d..26c19fa 100644
--- a/debian/network-console.templates
+++ b/debian/network-console.templates
@@ -79,15 +79,15 @@ _Description: Start SSH
 Template: network-console/authorized_keys_url
 Type: string
 Description: for internal use; can be preseeded
- What URL contains a list of authorized SSH public keys?
+

Bug#592550: String freeze for Debian Installer

2012-04-04 Thread Charles Plessy 
Le Wed, Apr 04, 2012 at 07:03:14AM +0200, Christian PERRIER a écrit :
 
 I would like to call for a string freeze in Debian Installer
 packages. As you may have read elsewhere (mostly through my boring
 blog posts), I'm currently fighting for bringing localization back to
 completeness for several languages. And this is a very time consuming
 task.

Dear Christian,

in #592550, I and others are proposing to add a functionality
to network-console, and the proposed patch would introduce the
following templates:

diff -pruN 1.29/debian/network-console.templates 
1.29ubuntu1/debian/network-console.templates
--- 1.29/debian/network-console.templates   2011-06-19 02:40:08.0 
+
+++ 1.29ubuntu1/debian/network-console.templates2011-10-18 
17:23:42.0 +
@@ -75,3 +75,19 @@ _Description: Start SSH
  .
  Please check this carefully against the fingerprint reported by
  your SSH client.
+
+Template: network-console/authorized_keys_url
+Type: string
+Description: for internal use; can be preseeded
+ What URL contains a list of authorized SSH public keys?
+ .
+ The file at the given URL should be of the same form as a standard OpenSSH
+ authorized_keys file.
+
+Template: network-console/authorized_keys_fetch_failure
+Type: error
+# should be translated when committed upstream
+Description: Could not fetch OpenSSH authorized keys
+ An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
+ .
+ Check /var/log/syslog or see virtual console 4 for the details.

How are considered the templates that are purposed for preseeding ?  Do you
think that, from an i18n point of view, it would still be possible to get that
patch in D-I for Wheezy ?  To be fair, this function is not essential; but it
is neat, as it allows to log in D-I with the same procedure as on some
high-profile machine images (like http://alestic.com/).

Reading the explanation about sublevels that you posted in 2007 (
http://lists.debian.org/debian-boot/2007/12/msg00480.html ), it looks like the
propose patch is actually missing an indication of sublevel.  Would sublevel 5
be relevant ?  I would like to update the patch and propose a NMU (depending on
your answer about string freeze).

Have a nice day,

-- 
Charles Plessy
Debian Med packaging team,
http://www.debian.org/devel/debian-med
Tsurumi, Kanagawa, Japan



--
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120404071116.gg12...@falafel.plessy.net

Bug#592550: String freeze for Debian Installer

2012-04-04 Thread Christian PERRIER 
Quoting Charles Plessy (ple...@debian.org):

 in #592550, I and others are proposing to add a functionality
 to network-console, and the proposed patch would introduce the
 following templates:
 
 diff -pruN 1.29/debian/network-console.templates 
 1.29ubuntu1/debian/network-console.templates
 --- 1.29/debian/network-console.templates 2011-06-19 02:40:08.0 
 +
 +++ 1.29ubuntu1/debian/network-console.templates  2011-10-18 
 17:23:42.0 +
 @@ -75,3 +75,19 @@ _Description: Start SSH
   .
   Please check this carefully against the fingerprint reported by
   your SSH client.
 +
 +Template: network-console/authorized_keys_url
 +Type: string
 +Description: for internal use; can be preseeded
 + What URL contains a list of authorized SSH public keys?
 + .
 + The file at the given URL should be of the same form as a standard OpenSSH
 + authorized_keys file.
 +
 +Template: network-console/authorized_keys_fetch_failure
 +Type: error
 +# should be translated when committed upstream
 +Description: Could not fetch OpenSSH authorized keys
 + An error occurred while fetching OpenSSH authorized keys from ${LOCATION}.
 + .
 + Check /var/log/syslog or see virtual console 4 for the details.
 
 How are considered the templates that are purposed for preseeding ?  Do you

They shouldn't be marked as translatable. Indeed the long description
will never be used.

The 2nd template should be translatable and is a good candidate for my
proposed sublevel 6 that wouldn't be counted in statistics (at least
those that I track)


 think that, from an i18n point of view, it would still be possible to get that
 patch in D-I for Wheezy ?  To be fair, this function is not essential; but it
 is neat, as it allows to log in D-I with the same procedure as on some
 high-profile machine images (like http://alestic.com/).
 
 Reading the explanation about sublevels that you posted in 2007 (
 http://lists.debian.org/debian-boot/2007/12/msg00480.html ), it looks like the
 propose patch is actually missing an indication of sublevel.  Would sublevel 5
 be relevant ?  I would like to update the patch and propose a NMU (depending 
 on
 your answer about string freeze).

I propose you use sublevel 6.

Then update the patch...then propose a patch to the D-I documentation
(the part about preseeding as any preseedable value should be
documented there).

I don't think an NMU for a -boot maintained package is the best
solution. Once the patch is OK for the D-I team, then we can commit it
and upload the package.




signature.asc
Description: Digital signature