Re: DSA concerns for jessie architectures - mips/mipsel

2013-09-29 Thread Tollef Fog Heen

Hi Graham,

]] Graham Whaley 

sorry if you get an unwanted Cc on this, I'm not sure what, if any of
the lists you're reading.

  I'd like to respond to your call for help regards the release
 qualification matrix, in particular for hardware (buildd and porter
 machines), and in particular for mips and mipsel arch.
 
  I wish to work with you to remedy some of the listed issues. I've started
 working with MIPS hardware vendors on availability and pricing of hardware.

That's good news, once you have solid numbers, I'd be most interested in
seeing them.  Feel free to just mail d...@debian.org if the numbers are
confidential.

  Having researched your current mips/mipsel setup and the requirements for
 jessie, the issues as I see them, and hopefully solutions, are:
 
 1) reliability. Corelli and Gabrielli are unstable. I saw the thread way
 back where they were investigated, but it seems un-fixable (and the
 machines are now rather old). Let's work on replacing both of those, and
 maybe Lucatelli as well, as it appears to be the same hardware (but
 possibly stable?).

I think this makes sense.

 2) supportability. We'll work on this to see what the options are. I'm sure
 we all want boxes that can be maintained/replaced easily.
 
 3) speed. I see 'mips' (but not mipsel in particular) listed as 'too slow'.
 Sure, Can somebody point me at some indication of the minimum requirement
 here (not that I'm particularly aiming at the minimum, I just wish to
 ensure we reach it :-). And, is this just pure
 single-multi-core/thread-machine speed, or is it a solvable problem by
 using multiple machines if necessary ?

I think others have covered this: the buildds need to be able to keep
up, which can be done with multiple machines.

In addition the current MIPS machines are currently significantly slower
than even armel (so that upgrading packages and running samhain take
unreasonably long).  These are single-core performance tasks and don't
scale with the number of machines.

 4) I see there is a note about an 'opcode implementation error' for a
 mipsel porter box. Sounds like a new machine(s) is needed there as well.
 Could somebody point me at some data on the opcode issue (more out of
 interest really...).

The mono JIT doesn't work on our MIPS machines due to the machines not
implementing the full architecture spec, AIUI.  Porter and buildd boxes
should not have hardware bugs like that.

 From the three types of machines I see you currently have I believe
 there are more modern versions of all of those, and possibly some
 others. I believe we will be able to locate hardware to solve the
 issues.

That would be great.  Ideally, we'd want fast, server class machines
with working OOB (both power and console), that use standard hardware
(SATA/SAS drives, etc) and that we have some kind of warranty for, so we
can get them replaced when they fail.  Ideally world-wide, so we can
have them hosted where we want.

-- 
Tollef Fog Heen, DSA
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/8761tjz890@qurzaw.varnish-software.com



Re: DSA concerns for jessie architectures

2013-06-24 Thread Tollef Fog Heen
]] Adam D. Barratt 

 I've folded these in to an initial matrix for jessie, assuming that any
 architecture which was not explicitly mentioned is not currently a
 concern for DSA.

Thanks, much appreciated!

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/m2wqpjxpew@rahvafeir.err.no



Bug#705264: unblock: ruby-yajl/1.1.0-2

2013-04-12 Thread Tollef Fog Heen
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Hi,

Some third-party repositories have shipped a copy of libruby-yajl
before, and to ease upgrades to Wheezy, it would be beneficial if the
ruby-yajl package in wheezy had Replaces and Conflicts according to the
new ruby policy.

I have uploaded such a version, 1.1.0-2 to unstable, please let it into
wheezy.  This was discussed with adsb on IRC and he seemed positive.

Changelog
=

ruby-yajl (1.1.0-2) unstable; urgency=low

  * Add Conflicts and Replaces on libyajl-ruby for the benefit of users of
third-party repositories.  Closes: #705261

 -- Tollef Fog Heen tfh...@debian.org  Fri, 12 Apr 2013 09:32:05 +0200

Debdiff
===

debdiff ruby-yajl_1.1.0-2_amd64.deb /tmp/ruby-yajl_1.1.0-1_amd64.deb
File lists identical (after any substitutions)

Control files: lines which differ (wdiff format)

[-Conflicts: libyajl-ruby-]
Installed-Size: [-270-] {+156+}
[-Replaces: libyajl-ruby-]
Version: [-1.1.0-2-] {+1.1.0-1+}

Git log
===

commit 2cbd5c24464cb47260d38342adc97f4516f426df
Author: Tollef Fog Heen tfh...@debian.org
Date:   Fri Apr 12 09:40:07 2013 +0200

releasing version 1.0.0-2

diff --git a/debian/changelog b/debian/changelog
index 769e7c5..0b1e567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-yajl (1.1.0-2) UNRELEASED; urgency=low
+ruby-yajl (1.1.0-2) unstable; urgency=low
 
   * Add Conflicts and Replaces on libyajl-ruby for the benefit of users of
 third-party repositories.  Closes: #705261

commit cd8caccffd1661f1edbe4c3eaa0d12c21631370e
Author: Tollef Fog Heen tfh...@debian.org
Date:   Fri Apr 12 09:39:03 2013 +0200

Add Conflicts and Replaces on libyajl-ruby for the benefit of users of 
third-party repositories.  Closes: #705261

diff --git a/debian/changelog b/debian/changelog
index bcf55b2..769e7c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-yajl (1.1.0-2) UNRELEASED; urgency=low
+
+  * Add Conflicts and Replaces on libyajl-ruby for the benefit of users of
+third-party repositories.  Closes: #705261
+
+ -- Tollef Fog Heen tfh...@debian.org  Fri, 12 Apr 2013 09:32:05 +0200
+
 ruby-yajl (1.1.0-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 4e6bb11..4f94cdd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Package: ruby-yajl
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter 
+Replaces: libyajl-ruby
+Conflicts: libyajl-ruby
 Description: Ruby interface to Yajl, a JSON stream-based parser library
  Supported features include,
  .


Thanks for reviewing this request!

unblock ruby-yajl/1.1.0-2

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87fvywfa6u@qurzaw.varnish-software.com



Bug#701882: release.debian.org: unblock: chef/10.12.0-3

2013-02-28 Thread Tollef Fog Heen
Package: release.debian.org
Severity: normal

The security fix in ruby-json 1.7.3-3 broke chef, and this is worked
around in the just-uploaded 10.12.0-3 version of chef.  Please unblock
this version.

Debdiff attached.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
diff -Nru chef-10.12.0/debian/changelog chef-10.12.0/debian/changelog
--- chef-10.12.0/debian/changelog	2012-08-05 21:04:52.0 +0200
+++ chef-10.12.0/debian/changelog	2013-02-28 14:07:45.0 +0100
@@ -1,3 +1,10 @@
+chef (10.12.0-3) unstable; urgency=high
+
+  * Backport fixes from 10.22 to work around API breakage in JSON gem.
+Closes: #701629
+
+ -- Tollef Fog Heen tfh...@debian.org  Thu, 28 Feb 2013 13:56:32 +0100
+
 chef (10.12.0-2) unstable; urgency=low
 
   * Team upload
diff -Nru chef-10.12.0/debian/patches/json_create_CVE-2013-0269_workaround.diff chef-10.12.0/debian/patches/json_create_CVE-2013-0269_workaround.diff
--- chef-10.12.0/debian/patches/json_create_CVE-2013-0269_workaround.diff	1970-01-01 01:00:00.0 +0100
+++ chef-10.12.0/debian/patches/json_create_CVE-2013-0269_workaround.diff	2013-02-28 13:54:47.0 +0100
@@ -0,0 +1,165 @@
+diff --git a/lib/chef/cookbook_version.rb b/lib/chef/cookbook_version.rb
+index 1c2deef..c7c9503 100644
+--- a/lib/chef/cookbook_version.rb
 b/lib/chef/cookbook_version.rb
+@@ -807,7 +807,7 @@ class Chef
+   cookbook_version.manifest = o
+ 
+   # We don't need the following step when we decide to stop supporting deprecated operators in the metadata (e.g. , )
+-  cookbook_version.manifest[metadata] = JSON.parse(cookbook_version.metadata.to_json)
++  cookbook_version.manifest[metadata] = Chef::JSONCompat.from_json(cookbook_version.metadata.to_json)
+ 
+   cookbook_version.freeze_version if o[frozen?]
+   cookbook_version
+diff --git a/lib/chef/json_compat.rb b/lib/chef/json_compat.rb
+index 9f59a41..4e14a11 100644
+--- a/lib/chef/json_compat.rb
 b/lib/chef/json_compat.rb
+@@ -24,6 +24,22 @@ class Chef
+   class JSONCompat
+ JSON_MAX_NESTING = 1000
+ 
++JSON_CLASS = json_class.freeze
++
++CHEF_APICLIENT  = Chef::ApiClient.freeze
++CHEF_CHECKSUM   = Chef::Checksum.freeze
++CHEF_COOKBOOKVERSION= Chef::CookbookVersion.freeze
++CHEF_DATABAG= Chef::DataBag.freeze
++CHEF_DATABAGITEM= Chef::DataBagItem.freeze
++CHEF_ENVIRONMENT= Chef::Environment.freeze
++CHEF_NODE   = Chef::Node.freeze
++CHEF_ROLE   = Chef::Role.freeze
++CHEF_SANDBOX= Chef::Sandbox.freeze
++CHEF_RESOURCE   = Chef::Resource.freeze
++CHEF_RESOURCECOLLECTION = Chef::ResourceCollection.freeze
++CHEF_WEBUIUSER  = Chef::WebUIUser.freeze
++CHEF_OPENIDREGISTRAION  = Chef::OpenIDRegistration.freeze
++
+ class self
+   # See CHEF-1292/PL-538. Increase the max nesting for JSON, which defaults
+   # to 19, and isn't enough for some (for example, a Node within a Node)
+@@ -38,7 +54,49 @@ class Chef
+ 
+   # Just call the JSON gem's parse method with a modified :max_nesting field
+   def from_json(source, opts = {})
+-::JSON.parse(source, opts_add_max_nesting(opts))
++obj = ::Yajl::Parser.parse(source)
++
++unless obj.kind_of?(Hash) || obj.kind_of?(Array)
++  raise JSON::ParserError, Top level JSON object must be a Hash or Array (actual: #{obj.class})
++end
++
++# The old default in the json gem (which we are mimicing because we
++# sadly rely on this misfeature) is to create additions i.e., convert
++# JSON objects into ruby objects. Explicit :create_additions = false
++# is required to turn it off.
++if opts[:create_additions].nil? || opts[:create_additions]
++  map_to_rb_obj(obj)
++else
++  obj
++end
++  rescue Yajl::ParseError = e
++raise JSON::ParserError, e.message
++  end
++
++  # Look at an object that's a basic type (from json parse) and convert it
++  # to an instance of Chef classes if desired.
++  def map_to_rb_obj(json_obj)
++res = case json_obj
++when Hash
++  mapped_hash = map_hash_to_rb_obj(json_obj)
++  if json_obj.has_key?(JSON_CLASS)  (class_to_inflate = class_for_json_class(json_obj[JSON_CLASS]))
++class_to_inflate.json_create(mapped_hash)
++  else
++mapped_hash
++  end
++when Array
++  json_obj.map {|e| map_to_rb_obj(e) }
++else
++  json_obj
++end
++res
++  end
++
++  def map_hash_to_rb_obj(json_hash)
++json_hash.each do |key, value|
++  json_hash[key] = map_to_rb_obj(value)
++end
++json_hash
+   end
+ 
+   def to_json(obj, opts = nil)
+@@ -48,6 +106,44 @@ class Chef
+   def to_json_pretty(obj, opts = nil)
+ ::JSON.pretty_generate(obj

Bug#699524: unblock: chef-solr/10.12.0+dfsg-2

2013-02-01 Thread Tollef Fog Heen
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock chef-solr 10.12.0+dfsg-2 which was just uploaded.

It contains two fixes for RC bugs, one which makes the package not work
and the other which makes it possible and easy to trash your
installation.

It also includes debconf updates as per the freeze policy.

Changelog:

  [ Tollef Fog Heen ]
  * Fix path to WEB-INF directory.  Closes: #684374
  * Stop installing chef-solr-installer again, not sure why that fix got
dropped.  Closes: #699519

  [ Christian Perrier ]
  * Debconf templates and debian/control reviewed by the debian-l10n-
english team as part of the Smith review project. Closes: #685578
  * [Debconf translation updates]
  * Polish (Michał Kułach).  Closes: #687554
  * Portuguese (Rui Branco).  Closes: #687707
  * Czech (Michal Simunek).  Closes: #687720
  * French (David Prévot).  Closes: #687721
  * Danish (Joe Hansen).  Closes: #687819
  * Russian (Yuri Kozlov).  Closes: #688051
  * German (Chris Leick).  Closes: #688155
  * Swedish (Martin Bagge / brother).  Closes: #688422
  * Italian (Beatrice Torracca).  Closes: #689039
  * Spanish; (# traductor (campo Last-Translator) y ponga en copia a la
lista de Matías Bellone).  Closes: #689461

Please see attached patch.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
diff --git a/debian/changelog b/debian/changelog
index 2725091..464b5c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+chef-solr (10.12.0+dfsg-2) unstable; urgency=high
+
+  [ Tollef Fog Heen ]
+  * Fix path to WEB-INF directory.  Closes: #684374
+  * Stop installing chef-solr-installer again, not sure why that fix got
+dropped.  Closes: #699519
+  
+  [ Christian Perrier ]
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+english team as part of the Smith review project. Closes: #685578
+  * [Debconf translation updates]
+  * Polish (Michał Kułach).  Closes: #687554
+  * Portuguese (Rui Branco).  Closes: #687707
+  * Czech (Michal Simunek).  Closes: #687720
+  * French (David Prévot).  Closes: #687721
+  * Danish (Joe Hansen).  Closes: #687819
+  * Russian (Yuri Kozlov).  Closes: #688051
+  * German (Chris Leick).  Closes: #688155
+  * Swedish (Martin Bagge / brother).  Closes: #688422
+  * Italian (Beatrice Torracca).  Closes: #689039
+  * Spanish; (# traductor (campo Last-Translator) y ponga en copia a la
+lista de Matías Bellone).  Closes: #689461
+
+ -- Tollef Fog Heen tfh...@debian.org  Fri, 01 Feb 2013 09:17:32 +0100
+
 chef-solr (10.12.0+dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/chef-solr.links b/debian/chef-solr.links
index e381dae..c83a7e0 100644
--- a/debian/chef-solr.links
+++ b/debian/chef-solr.links
@@ -4,8 +4,8 @@
 /var/log/jetty/ /var/lib/chef/solr/solr-jetty/logs
 /usr/share/jetty/start.jar  /var/lib/chef/solr/solr-jetty/start.jar
 /usr/share/jetty/webapps/root/  /var/lib/chef/solr/solr-jetty/webapps/root
-/usr/share/solr/admin   /var/lib/chef/solr/solr-jetty/webapps/solr/admin
+/usr/share/solr/web/admin   /var/lib/chef/solr/solr-jetty/webapps/solr/admin
 /etc/solr/conf  /var/lib/chef/solr/solr-jetty/webapps/solr/conf
 /usr/share/solr/scripts /var/lib/chef/solr/solr-jetty/webapps/solr/scripts
-/usr/share/solr/WEB-INF/lib//var/lib/chef/solr/solr-jetty/webapps/solr/WEB-INF/lib
+/usr/share/solr/web/WEB-INF/lib/ /var/lib/chef/solr/solr-jetty/webapps/solr/WEB-INF/lib
 /etc/solr/web.xml   /var/lib/chef/solr/solr-jetty/webapps/solr/WEB-INF/web.xml
diff --git a/debian/chef-solr.templates b/debian/chef-solr.templates
index e14a49a..e5e552d 100644
--- a/debian/chef-solr.templates
+++ b/debian/chef-solr.templates
@@ -1,12 +1,22 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-engl...@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: chef-solr/amqp_password
 Type: password
-Description: New password for the 'chef' AMQP user in the RabbitMQ vhost /chef:
-  Set the password for the chef user in the AMQP server queue. Use
-  RabbitMQ's rabbitmqctl program to set this password. The default user
-  and vhost are assumed (chef and /chef, respectively).
-  .
-  RabbitMQ does not have the capability to read the password from a file, and
-  this will be passed via  on the command-line. As such, do not use shell
-  meta-characters that could cause errors such as !.
-  .
-  This will be used in /etc/chef/solr.rb and /etc/chef/server.rb as 'amqp_pass'.
+_Description: AMQP user password:
+ Please choose the password for the chef AMQP user in the RabbitMQ
+ vhost /chef.
+ .
+ RabbitMQ's rabbitmqctl program, which will be used

Bug#696498: release.debian.org: unblock: ykclient/2.8-2

2012-12-21 Thread Tollef Fog Heen
Package: release.debian.org
Severity: normal

Please unblock ykclient 2.8-2.  Debdiff attached.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
diff -u ykclient-2.8/debian/rules ykclient-2.8/debian/rules
--- ykclient-2.8/debian/rules
+++ ykclient-2.8/debian/rules
@@ -20 +20,2 @@
-#override_dh_auto_test:
+override_dh_auto_test:
+	dh_auto_test -- CFLAGS=-DTEST_WITHOUT_INTERNET 
diff -u ykclient-2.8/debian/changelog ykclient-2.8/debian/changelog
--- ykclient-2.8/debian/changelog
+++ ykclient-2.8/debian/changelog
@@ -1,3 +1,12 @@
+ykclient (2.8-2) unstable; urgency=low
+
+  * Fix FTBFS on signed-char architectures.  Thanks to Jakub Wilk for the
+patch.  Closes: #694804.
+  * Apply patch from Ubuntu to disable network for tests.  Thanks to
+Michael Terry for the patch.  Closes: #682873
+
+ -- Tollef Fog Heen tfh...@debian.org  Fri, 21 Dec 2012 19:48:28 +0100
+
 ykclient (2.8-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- ykclient-2.8.orig/b64/cdecode.c
+++ ykclient-2.8/b64/cdecode.c
@@ -9,10 +9,11 @@
 
 int base64_decode_value(char value_in)
 {
-	static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+	static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
 	static const char decoding_size = sizeof(decoding);
+	if (value_in  43) return -1;
 	value_in -= 43;
-	if (value_in  0 || value_in  decoding_size) return -1;
+	if (value_in  decoding_size) return -1;
 	return decoding[(int)value_in];
 }
 
@@ -26,7 +27,7 @@
 {
 	const char* codechar = code_in;
 	char* plainchar = plaintext_out;
-	char fragment;
+	int fragment;
 	
 	*plainchar = state_in-plainchar;
 	
@@ -42,7 +43,7 @@
 	state_in-plainchar = *plainchar;
 	return plainchar - plaintext_out;
 }
-fragment = (char)base64_decode_value(*codechar++);
+fragment = base64_decode_value(*codechar++);
 			} while (fragment  0);
 			*plainchar= (fragment  0x03f)  2;
 	case step_b:
@@ -53,7 +54,7 @@
 	state_in-plainchar = *plainchar;
 	return plainchar - plaintext_out;
 }
-fragment = (char)base64_decode_value(*codechar++);
+fragment = base64_decode_value(*codechar++);
 			} while (fragment  0);
 			*plainchar++ |= (fragment  0x030)  4;
 			*plainchar= (fragment  0x00f)  4;
@@ -65,7 +66,7 @@
 	state_in-plainchar = *plainchar;
 	return plainchar - plaintext_out;
 }
-fragment = (char)base64_decode_value(*codechar++);
+fragment = base64_decode_value(*codechar++);
 			} while (fragment  0);
 			*plainchar++ |= (fragment  0x03c)  2;
 			*plainchar= (fragment  0x003)  6;
@@ -77,7 +78,7 @@
 	state_in-plainchar = *plainchar;
 	return plainchar - plaintext_out;
 }
-fragment = (char)base64_decode_value(*codechar++);
+fragment = base64_decode_value(*codechar++);
 			} while (fragment  0);
 			*plainchar++   |= (fragment  0x03f);
 		}


Bug#685320: release.debian.org: unblock: ruby-merb-haml/1.1.3-2

2012-08-20 Thread Tollef Fog Heen
]] Adam D. Barratt 

 Control: tags -1 + moreinfo
 
 On Sun, 2012-08-19 at 19:41 +0200, Tollef Fog Heen wrote:
  Please unblock ruby-merb-haml 1.1.3-2, it adds a missing dependency on
  ruby-haml.
 
 That version doesn't appear to be in the archive (or any of the delayed
 queues) yet?

It would have helped if I had actually uploaded it, wouldn't it?  :-)

Just uploaded it.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87ehn1n3xz@qurzaw.varnish-software.com



Bug#685320: release.debian.org: unblock: ruby-merb-haml/1.1.3-2

2012-08-19 Thread Tollef Fog Heen
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock ruby-merb-haml 1.1.3-2, it adds a missing dependency on 
ruby-haml.

unblock ruby-merb-haml/1.1.3-2

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.4.0 (SMP w/4 CPU cores)
Locale: LANG=nb_NO.UTF-8, LC_CTYPE=nb_NO.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87393i6apv@xoog.err.no



Re: Freeze exception request: systemd 44-4

2012-07-21 Thread Tollef Fog Heen
]] Adam D. Barratt 

 On Wed, 2012-07-11 at 00:08 +0100, Adam D. Barratt wrote:
 [...]
   On Sun, Jul 01, 2012 at 10:18:41AM +0200, Tollef Fog Heen wrote:
systemd (44-4) unstable; urgency=low
   
  * Move diversion removal from postinst to preinst.  Closes: 
   #679728
  * Prevent the journal from crashing when running out of disk 
   space.
This is 499fb21 from upstream.  Closes: #668047.
  * Stop mounting a tmpfs on /media.  Closes: #665943
 [...]
  Please go ahead; apologies for the delay in getting back to you.
 
 Any news on that?

Sorry about not making this upload earlier.  I'd like to include a fix
for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680011 too, the
additional diff looks like:

diff --git a/Makefile.am b/Makefile.am
index eb58476..061a4f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2201,13 +2201,15 @@ XSLTPROC_FLAGS = \
--nonet \
--stringparam funcsynopsis.style ansi
 
+T=$(shell dpkg-parsechangelog | awk -F:  '$$1 == Date { print $$2 }')
+
 XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@)  \
-   $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) 
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $
+   TZ=UTC faketime $(T) $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) 
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $
 
 XSLTPROC_PROCESS_HTML = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@)  \
-   $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $
+   TZ=UTC faketime $(T) $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) 
$(srcdir)/man/custom-html.xsl $
 
 man/%.1: man/%.xml
$(XSLTPROC_PROCESS_MAN)
diff --git a/debian/changelog b/debian/changelog
index 6622eb6..699669f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 systemd (44-4) unstable; urgency=low
 
+  [ Michael Biebl ]
+  * Override timestamp for man page building, thereby avoiding skew
+between architectures which caused problems for multi-arch.
+Closes: #680011
+
+  [ Tollef Fog Heen ]
   * Move diversion removal from postinst to preinst.  Closes: #679728
   * Prevent the journal from crashing when running out of disk space.
 This is 499fb21 from upstream.  Closes: #668047.
diff --git a/debian/control b/debian/control
index 33717aa..70ca95b 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,8 @@ Build-Depends: debhelper (= 9),
liblzma-dev,
libgee-dev,
gperf,
-   libkmod-dev (= 5)
+   libkmod-dev (= 5),
+   faketime
 
 Package: systemd
 Architecture: linux-any

Ok to upload this?  (I'm using dh-autoreconf, so no need to patch the
Makefile.in file.)

Cheers,
-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87pq7og84q@xoog.err.no



Re: Freeze exception request: systemd 44-4

2012-07-21 Thread Tollef Fog Heen
]] Adam D. Barratt 

  Ok to upload this?  (I'm using dh-autoreconf, so no need to patch the
  Makefile.in file.)
 
 Looks sane enough; please go ahead.

Thanks, uploading as we speak.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/878vecg2xo@xoog.err.no



Re: Freeze exception for ruby-fast-xs 0.8.0-3

2012-07-10 Thread Tollef Fog Heen
]] Adam D. Barratt 

(please Cc me on replies, I'm not subscribed to the list)

 On Thu, 2012-07-05 at 08:51 -0300, Antonio Terceiro wrote:
  Adam D. Barratt escreveu isso aí:
   Looking through the BTS, it looks like both #679606 (in
   ruby-hpricot) and #679847 (in ruby-xs-fast) only affect unstable
   currently; is that correct?
  
  Yes, that is correct. However, the situation is a little more
  complicated.
 [...]
  If we can't get the fixed ruby-fast-xs in wheezy, then the existing
  version of ruby-hpricot in wheezy will be fine, but we won't have
  chef-expander, which is an important piece in large-scale Debian
  deployments with chef.
 
 Thanks for the explanation.  If it's such an important part though, it's
 slightly surprising that there were no uploads to Debian (not even to
 experimental) until the day before the freeze. :-(

It's been developed and maintained in an upstream apt repository and
while I was in touch with them some years ago about getting it into
Debian, the effort was only seriously started early this summer.
Upstream has been doing packaging in their own repository for quite some
time (as can be evidenced by the changelog).

  This is why I am requesting this exception to be able to have
  ruby-fast-xs, the fixed ruby-hpricot and chef-expander in Wheezy.
 
 It's not just those three packages, fwiw.  chef-expander then ends up
 depending on a chain of a further six NEW packages (for a total of eight
 NEW sources, most uploaded within the couple of days before the freeze).

They are at least in part based on chef's upstream packaging of
same. And, they're scheduled to go in today anyway, so the only
difference to whether ruby-fast-xs 0.8.0-3 is approved or not is whether
that version plus chef-expander goes in, not the rest of the ruby
packages.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/877guc2eqr@qurzaw.varnish-software.com



Freeze exception request: systemd 44-4

2012-07-01 Thread Tollef Fog Heen

(please Cc me on replies, I'm not subscribed)

Hiya,

I've got a couple important fixes for systemd I would like to get into
wheezy:

systemd (44-4) unstable; urgency=low

  * Move diversion removal from postinst to preinst.  Closes: #679728
  * Prevent the journal from crashing when running out of disk space.
This is 499fb21 from upstream.  Closes: #668047.
  * Stop mounting a tmpfs on /media.  Closes: #665943

 -- Tollef Fog Heen tfh...@debian.org  Sun, 01 Jul 2012 08:17:50 +0200

This is on top of yesterday's upload to unstable (44-2 is in testing
already):

systemd (44-3) unstable; urgency=low

  [ Michael Biebl ]
  * Bump to debhelper 9.
  * Convert to Multi-Arch: same where possible.  Closes: #676615

  [ Tollef Fog Heen ]
  * Cherry-pick d384c7 from upstream to stop journald from leaking
memory.  Thanks to Andreas Henriksson for testing.  Closes: #677701
  * Ship lsb init script override/integration in /lib/lsb/init-functions.d
rather than diverting /lib/lsb/init-functions itself.  Add appropriate
Breaks to ensure upgrades happen.

 -- Tollef Fog Heen tfh...@debian.org  Fri, 29 Jun 2012 22:34:16 +0200

I have not yet uploaded 44-4, so this is a request for pre-approval for
an unblock.

Full patches are attached.

Cheers,
-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
diff --git a/debian/changelog b/debian/changelog
index a0e237e..535d27a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+systemd (44-3) unstable; urgency=low
+
+  [ Michael Biebl ]
+  * Bump to debhelper 9.
+  * Convert to Multi-Arch: same where possible.  Closes: #676615
+
+  [ Tollef Fog Heen ]
+  * Cherry-pick d384c7 from upstream to stop journald from leaking
+memory.  Thanks to Andreas Henriksson for testing.  Closes: #677701
+  * Ship lsb init script override/integration in /lib/lsb/init-functions.d
+rather than diverting /lib/lsb/init-functions itself.  Add appropriate
+Breaks to ensure upgrades happen.
+
+ -- Tollef Fog Heen tfh...@debian.org  Fri, 29 Jun 2012 22:34:16 +0200
+
 systemd (44-2) unstable; urgency=low
 
   [ Michael Biebl ]
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 7638583..33717aa 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.9.2
 Vcs-Git: git://git.err.no/systemd/
 Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary
 Homepage: http://www.freedesktop.org/wiki/Software/systemd
-Build-Depends: debhelper (= 8.1.0),
+Build-Depends: debhelper (= 9),
libcap-dev,
pkg-config,
libudev-dev (= 172),
@@ -42,7 +42,7 @@ Recommends: libpam-systemd
 Suggests: systemd-gui, python, python-dbus, python-cairo
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (= 2.19.1-2), initscripts (= 2.88dsf-17), udev
-Breaks: lvm2 ( 2.02.84-1)
+Breaks: lvm2 ( 2.02.84-1), lsb-base ( 4.1+Debian4)
 Conflicts: klogd
 Description: system and service manager
  systemd is a replacement for sysvinit.  It is dependency-based and
@@ -74,8 +74,10 @@ Description: system and service manager - SysV links
 
 Package: libpam-systemd
 Architecture: linux-any
+Multi-Arch: same
 Section: admin
 Priority: extra
+Pre-Depends: ${misc:Pre-Depends}
 Depends: systemd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: system and service manager - PAM module
  systemd is a replacement for sysvinit.  It is dependency-based and
@@ -107,7 +109,9 @@ Description: system and service manager - GUI
 
 Package: libsystemd-login0
 Architecture: linux-any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: systemd login utility library
  The libsystemd-login library provides an interface for the
@@ -125,7 +129,9 @@ Description: systemd login utility library - development files
 
 Package: libsystemd-daemon0
 Architecture: linux-any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: systemd utility library
  The sd-daemon library provides a reference implementation of various
@@ -143,7 +149,9 @@ Description: systemd utility library - development files
 
 Package: libsystemd-journal0
 Architecture: linux-any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: systemd journal utility library
  The libsystemd-journal library provides an interface for the
@@ -161,7 +169,9 @@ Description: systemd journal utility library - development files
 
 Package: libsystemd-id128-0
 Architecture: linux-any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: systemd 128 bit ID utility library
  The libsystemd-id128

Re: Freeze exception request: systemd 44-4

2012-07-01 Thread Tollef Fog Heen
]] Philipp Kern 

 On Sun, Jul 01, 2012 at 10:18:41AM +0200, Tollef Fog Heen wrote:
  I've got a couple important fixes for systemd I would like to get into
  wheezy:
  
  systemd (44-4) unstable; urgency=low
  
* Move diversion removal from postinst to preinst.  Closes: #679728
* Prevent the journal from crashing when running out of disk space.
  This is 499fb21 from upstream.  Closes: #668047.
* Stop mounting a tmpfs on /media.  Closes: #665943
  
   -- Tollef Fog Heen tfh...@debian.org  Sun, 01 Jul 2012 08:17:50 +0200
 
 That doesn't fit the diff you posted.

Indeed.  Correct patch attached.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
diff --git a/Makefile.am b/Makefile.am
index 079c118..eb58476 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -294,7 +294,6 @@ dist_systemunit_DATA = \
 	units/sys-kernel-security.mount \
 	units/sys-fs-fuse-connections.mount \
 	units/var-run.mount \
-	units/media.mount \
 	units/remount-rootfs.service \
 	units/printer.target \
 	units/sound.target \
@@ -2306,13 +2305,11 @@ systemd-install-data-hook:
 		rm -f systemd-remount-api-vfs.service \
 			fsck-root.service \
 			remount-rootfs.service \
-			var-run.mount \
-			media.mount  \
+			var-run.mount  \
 		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service  \
 		$(LN_S) ../fsck-root.service fsck-root.service  \
 		$(LN_S) ../remount-rootfs.service remount-rootfs.service  \
-		$(LN_S) ../var-run.mount var-run.mount  \
-		$(LN_S) ../media.mount media.mount )
+		$(LN_S) ../var-run.mount var-run.mount )
 	( cd $(DESTDIR)$(userunitdir)  \
 		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target  \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target  \
diff --git a/TODO b/TODO
index d33ae7f..4bdbb93 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,8 @@ Bugfixes:
 
 Features:
 
+* dbus upstream still refers to dbus.target and shouldn't
+
 * journald: make configurable store-on-var, store-on-run, dont-store, auto
   (store-persistent, store-volatile?)
 
diff --git a/debian/changelog b/debian/changelog
index 535d27a..6622eb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+systemd (44-4) unstable; urgency=low
+
+  * Move diversion removal from postinst to preinst.  Closes: #679728
+  * Prevent the journal from crashing when running out of disk space.
+This is 499fb21 from upstream.  Closes: #668047.
+  * Stop mounting a tmpfs on /media.  Closes: #665943
+
+ -- Tollef Fog Heen tfh...@debian.org  Sun, 01 Jul 2012 08:17:50 +0200
+
 systemd (44-3) unstable; urgency=low
 
   [ Michael Biebl ]
diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index 778f60b..366f7f5 100644
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -59,12 +59,6 @@ if dpkg --compare-versions $2 lt 40-1; then
 fi
 fi
 
-if [ $1 = configure ]  [ -n $2 ]  dpkg --compare-versions $2 lt 44-3; then
-rm -f /lib/lsb/init-functions
-dpkg-divert --remove --package systemd --rename \
---divert /lib/lsb/init-functions.systemd /lib/lsb/init-functions
-fi
-
 systemd-machine-id-setup
 
 #DEBHELPER#
diff --git a/debian/systemd.preinst b/debian/systemd.preinst
new file mode 100644
index 000..22b4e36
--- /dev/null
+++ b/debian/systemd.preinst
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ $1 = install ] || [ $1 = upgrade ]  [ -n $2 ]  dpkg --compare-versions $2 lt 44-3; then
+rm -f /lib/lsb/init-functions
+dpkg-divert --remove --package systemd --rename \
+--divert /lib/lsb/init-functions.systemd /lib/lsb/init-functions
+fi
+
+#DEBHELPER#
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 87390bd..7d798d9 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -329,7 +329,10 @@ static void server_rotate(Server *s) {
 if (s-runtime_journal) {
 r = journal_file_rotate(s-runtime_journal);
 if (r  0)
-log_error(Failed to rotate %s: %s, s-runtime_journal-path, strerror(-r));
+if (s-runtime_journal)
+log_error(Failed to rotate %s: %s, s-runtime_journal-path, strerror(-r));
+else
+log_error(Failed to create new runtime journal: %s, strerror(-r));
 else
 server_fix_perms(s, s-runtime_journal, 0);
 }
@@ -337,7 +340,11 @@ static void server_rotate(Server *s) {
 if (s-system_journal) {
 r = journal_file_rotate(s-system_journal);
 if (r  0)
-log_error(Failed to rotate %s: %s, s-system_journal-path, strerror(-r));
+if (s-system_journal)
+log_error(Failed to rotate %s: %s, s-system_journal-path, strerror(-r));
+else
+log_error(Failed to create new system journal: %s, strerror

Re: Bug#676817: systemd and dovecot

2012-06-17 Thread Tollef Fog Heen
]] Nicholas Bamber 

  However, whilst I don't know anything about systemd, this still looks
  like a little broken. I am puzzled that the dependency is on systemd and
  not libsystemd-daemon-dev. After all the libsystemd-daemon-dev package
  contains the /usr/include/systemd/sd-daemon.h file which is included
  by some dovecot source files.

It might be for the systemd.pc file, which is shipped in systemd itself.

The reason for this is I don't see a point in having a systemd-dev
package that only contains this file, when installing systemd doesn't
actually hurt or change your system any more than any other random
non-daemon package.

I think it's fairly obvious this build-dependency only makes sense on
Linux, yes.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/874nqamkma@xoog.err.no



Re: Bug#676817: systemd and dovecot

2012-06-17 Thread Tollef Fog Heen
]] Nicholas Bamber 

 Tollef,
   Thanks for the response. What about the libsystemd-daemon-dev package?
 Is that required (on Linux)?

I don't know in detail why dovecot build-deps on systemd, but I believe
it's for the socket activation.  It can either include sd-daemon.[ch] in
the source tree, in which case no build-dependency is needed, or it can
use the files from the systemd tree, in which case the dependency is
needed.  I don't know which of those solutions dovecot has chosen.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87wr36l3qp@xoog.err.no



Re: Bug#676817: systemd and dovecot

2012-06-17 Thread Tollef Fog Heen
]] Nicholas Bamber 

Hi,

I would be most grateful if you quoted the way is usually done on email
lists.

   I would be very grateful if you could have a look. Andreas Barth has
 basically repeated the point I made in the third paragraph of my
 original post.

Yes, and you're both mistaken.  systemd is not a normal daemon package,
it does not start any daemons, nor replace init merely by being
installed.  Installing systemd onto a system is about as intrusive to
the system as a whole as installing nvi.

 Nothing you have said is really reassuring me. You talk about how a
 package needs something to make socket activation to work and
 sd-daemon.h is a way to do that. Well that file is available in
 libsystemd-daemon-dev, and the current package as a dependency on
 systemd rather than libsystemd-daemon-dev. It might be right but it
 does not feel right.

I would suggest you ask the dovecot maintainer why he build-depends on
systemd rather than libsystemd-daemon-dev if it is in fact for the
reasons I listed.  I gave a suggestion as to why he would do so, as well
as a reason for why systemd.pc is not in its own package, but as I am
not the maintainer of dovecot and there's no way for me to actually
know, short of asking, which you can just as easily do yourself.

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87sjdukzeg@xoog.err.no



Suggested release goal: /run

2011-03-30 Thread Tollef Fog Heen

(Please keep me in Cc, I'm not subscribed)

Proposer: Tollef Fog Heen tfh...@debian.org
Seconder: Michael Biebl bi...@debian.org

Currently, /lib/init/rw exists as a place for applications that need
write access early (before $local_fs) to put their data. In addition,
some abuse /dev/shm for this.  A couple of years back, /run was
suggested, but /lib/init/rw ended up being chosen.

However, various upstreams are not using /lib/init/rw, they're more
likely to use hidden directories in /dev, like /dev/.udev and
/dev/.initramfs.  This is both ugly and a violation of the FHS.

Various upstreams seem to now unite under the banner of /run and I
think it would make sense for us to follow suit, see [1] for Lennart
Poettering's mail to the Fedora devel list and [2] for the FHS bug
about it.

I'm therefore proposing the goal of:

- /run should exist as a tmpfs
- /var/run should be a symlink or bind mount of/to /run
- /var/lock should be a symlink/bind mount to /run/lock
- /lib/init/rw should be a symlink/bind mount to /run
- applications are free to use /run as they have previously used
  /var/run.  Applications using /lib/init/rw and /dev/shm are to be
  changed to use /run.

/var/run and /var/lock as tmpfs is already reasonably well supported
since this has been in use in Ubuntu for a while and it's been a
supported (but optional) configuration in Debian for some time.

[1]: http://lists.fedoraproject.org/pipermail/devel/2011-March/150031.html
[2]: http://bugs.freestandards.org/show_bug.cgi?id=718

Regards,
-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87fwq4tyuv@qurzaw.varnish-software.com



yubikey-personalization 1.3.2-1squeeze1

2011-01-26 Thread Tollef Fog Heen

Hi,

I've uploaded yubikey-personalization 1.3.2-1squeeze1.  It fixes two
security-related bugs, so I'd appreciate if it could be approved for
squeeze, even if they're technically not RC.

Changelog:

yubikey-personalization (1.3.2-1squeeze1) testing-proposed-updates; urgency=high

  * Cherry-pick 8dfdff1 from upstream:
Reject -a values with upper case hex as yubikey_hex_decode only
handles lowercase values.  This makes invalid input not end up with a
null key.
  * Cherry-pick 76769856..0fa7260 from upstream: 
Fix bug that prevented salting during AES key generation from
passwords from working.  Closes: #608443

 -- Tollef Fog Heen tfh...@debian.org  Wed, 26 Jan 2011 08:15:34 +0100

I've attached the diff from the previous version as well.

Please Cc me on replies, I'm not subscribed to -release.

Best regards,
-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
diff -u yubikey-personalization-1.3.2/debian/changelog yubikey-personalization-1.3.2/debian/changelog
--- yubikey-personalization-1.3.2/debian/changelog
+++ yubikey-personalization-1.3.2/debian/changelog
@@ -1,3 +1,15 @@
+yubikey-personalization (1.3.2-1squeeze1) testing-proposed-updates; urgency=high
+
+  * Cherry-pick 8dfdff1 from upstream:
+Reject -a values with upper case hex as yubikey_hex_decode only
+handles lowercase values.  This makes invalid input not end up with a
+null key.
+  * Cherry-pick 76769856..0fa7260 from upstream: 
+Fix bug that prevented salting during AES key generation from
+passwords from working.  Closes: #608443
+
+ -- Tollef Fog Heen tfh...@debian.org  Wed, 26 Jan 2011 08:15:34 +0100
+  
 yubikey-personalization (1.3.2-1) unstable; urgency=low
 
   * New upstream release:
only in patch2:
unchanged:
--- yubikey-personalization-1.3.2.orig/ykpersonalize.c
+++ yubikey-personalization-1.3.2/ykpersonalize.c
@@ -57,9 +57,9 @@
 -cXXX..   A 12 char hex value to use as access code for programming\n
   (this does NOT SET the access code, that's done with -oaccess=)\n
 -oOPTION  change configuration option.  Possible OPTION arguments are:\n
-  salt=   Salt to be used for key generation.  If\n
-  none is given, a unique random one will be\n
-  generated.\n
+  salt=   Salt to be used when deriving key from a\n
+  password.  If none is given, a unique random\n
+  one will be generated.\n
   fixed=xxx   The public identity of key, in MODHEX.\n
   This is 0-16 characters long.\n
   uid=xx  The uid part of the generated ticket, in HEX.\n
only in patch2:
unchanged:
--- yubikey-personalization-1.3.2.orig/ykpers.c
+++ yubikey-personalization-1.3.2/ykpers.c
@@ -1,6 +1,6 @@
 /* -*- mode:C; c-file-style: bsd -*- */
 /*
- * Copyright (c) 2008, 2009, Yubico AB
+ * Copyright (c) 2008, 2009, 2010, Yubico AB
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -134,15 +134,9 @@
 		return 1;  /* Bad AES key */
 	}
 
-/* Make sure that the hexkey is made up of only [0-9a-f] */
-	int i;
-	for (i=0; i  strlen(hexkey); i++) {
-		char c = tolower(hexkey[i]);
-/* In ASCII, 0-9 == 48-57 and a-f == 97-102 */
-		if ( c48 || (c57  c97) || c102 ) {
-			return 1;
-		}
-	}
+	/* Make sure that the hexkey is made up of only [0-9a-f] */
+	if (! yubikey_hex_p(hexkey))
+		return 1;
 
 	yubikey_hex_decode(aesbin, hexkey, sizeof(aesbin));
 	memcpy(cfg-ykcore_config.key, aesbin, sizeof(cfg-ykcore_config.key));
@@ -178,8 +172,8 @@
 	size_t read_bytes = 0;
 
 	while (read_bytes  sizeof(_salt)) {
-		size_t n = fread(cfg-ykcore_config.key[read_bytes],
- 1, KEY_SIZE - read_bytes,
+		size_t n = fread(_salt[read_bytes],
+ 1, sizeof (_salt) - read_bytes,
  random_file);
 		read_bytes += n;
 	}


Re: yubikey-personalization 1.3.2-1squeeze1

2011-01-26 Thread Tollef Fog Heen
]] Adam D. Barratt 

| On Wed, 2011-01-26 at 18:47 +0100, Tollef Fog Heen wrote:
|  I've uploaded yubikey-personalization 1.3.2-1squeeze1.  It fixes two
|  security-related bugs, so I'd appreciate if it could be approved for
|  squeeze, even if they're technically not RC.
| 
| I approved the upload when I noticed it this morning, having reviewed
| the bug log.

Thanks!

| It's generally appreciated if you mail _before_ uploading,
| however. :-) (Partly to avoid the potential for re-uploads and wasted
| buildd time if there are any problems with the proposed diff, and
| partly because there are crazy people out there with t-p-u in their
| sources.list, because they can[tm]).

Ok.  The reason I uploaded first was the list on
http://www.debian.org/doc/developers-reference/pkgs.html#t-p-u . Perhaps
that should be updated to the correct procedure?  It's the second hit on
google for «testing-proposed-updates» for me and I assumed it was
correct.

Regards
-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87ipxba11s@qurzaw.varnish-software.com



cyrus-imapd-2.2 binNMU?

2008-04-04 Thread Tollef Fog Heen

Hi,

it seems like cyrus-clients-2.2 is uninstallable due to an ABI
transition in libkrb5-*-heimdal, at least on AMD64.  Could we have a
binNMU to fix this?

-- 
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



RFFE: ia32-libs

2005-05-05 Thread Tollef Fog Heen

(RFFE is of course Request For Freeze Exception)

I've just uploaded a new version of ia32-libs which fixes all the
outstanding bugs:

#305122: /usr/bin/ld:/emul/ia32-linux/usr/lib/libc.so:1: parse error
#307521: ia32-libs: Broken on amd64 / Compilation with 'gcc-3.4 -m32'
does not work
#306512: bad libc-2.3.2.so causes segfaults

Please allow for a freeze exception once the new version has stayed
its few days in unstable; the current version in testing is fairly
broken.

(And please respect my MFT, I'm not on -release)

-- 
Tollef Fog Heen,''`.
UNIX is user friendly, it's just picky about who its friends are  : :' :
  `. `' 
`-  


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: Transitioning to Mozilla Firefox 1.0PR

2004-11-11 Thread Tollef Fog Heen
* Johannes Rohr 

| Three of those packages can be easily brought up-to-date within five
| minutes: Please download the latest langpack from ftp.mozilla.org and
| rebuild your package. Here are the URLs:

No, they can not.  I've run into problems getting the nb_NO version to
work properly.

If the release team wants to pull mozilla-firefox-nb in order for
firefox 1.0 to go into sarge, feel free.

(I'm going to investigate this further, but the current version isn't
much good atm.)

-- 
Tollef Fog Heen,''`.
UNIX is user friendly, it's just picky about who its friends are  : :' :
  `. `' 
`-