Bug#645897: ITP: nosexcover -- Add Cobertura-style XML coverage report to nose

2012-06-19 Thread Soren Hansen
2012/6/19 Guido Günther a...@sigxcpu.org:
 On Wed, Oct 19, 2011 at 03:17:33PM +0200, Soren Hansen wrote:
 Package: wnpp
 Severity: wishlist
 Owner: Soren Hansen so...@linux2go.dk


 * Package name    : nosexcover
 Any news on this one?

Sorry, no. I lost my momentum. If you want to take it over, feel free.

-- 
Soren Hansen             | http://linux2go.dk/
Senior Software Engineer | http://www.cisco.com/
Ubuntu Developer         | http://www.ubuntu.com/
OpenStack Developer      | http://www.openstack.org/



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#611784: geteltorito in genisoimage doesn't extract hard drive images properly

2012-01-31 Thread Soren Hansen
Package: cdrkit
Version: 9:1.1.11-2
Followup-For: Bug #611784
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch


In Ubuntu, we've applied the attached patch to update geteltorito to the
new upstream version.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-12-generic (SMP w/4 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u cdrkit-1.1.11/debian/changelog cdrkit-1.1.11/debian/changelog
only in patch2:
unchanged:
--- cdrkit-1.1.11.orig/3rd-party/geteltorito/geteltorito.pl
+++ cdrkit-1.1.11/3rd-party/geteltorito/geteltorito.pl
@@ -11,10 +11,16 @@
 # License: GPL
 #
 # Get latest version from:
-# http://www.uni-koblenz.de/~krienke/ftp/noarch/geteltorito
+# http://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito
 #
-$utilVersion=0.4; 
+$utilVersion=0.5; 
 #
+# Version 0.5
+#2009/06/22
+#A patch for harddisk emulation images from coli...@gmail.com.
+#For BootMediaType=4 (harddisk emulation) SectorCount is always 1, and geteltorito.pl
+#returns just MBR. This patch guesses the correct bootimage size
+#from MBR (offset+size of the first partitition).
 # Version 0.4
 #2007/02/01
 #A patch from Santiago Garcia ma...@debian.org to use a virtual sector
@@ -31,9 +37,7 @@
 #Initial release
 #
 # For information on El Torito see 
-# http://wikipedia.org/
-# or try this link directly:
-# http://www.phoenix.com/en/Customer+Services/White+Papers-Specs/Platform+System+Software+Documents/default.htm
+# http://en.wikipedia.org/wiki/El_torito
 
 $vSecSize=512;
 $secSize=2048;
@@ -179,19 +183,22 @@
 }
 if( $media == 1 ){
 	print STDERR 1.2meg floppy;
-   $count=1200*1024/$vSecSize;  
+$count=1200*1024/$vSecSize;  
 }
 if( $media == 2 ){
 	print STDERR 1.44meg floppy;
-   $count=1440*1024/$vSecSize;  
+$count=1440*1024/$vSecSize;  
 }
 if( $media == 3 ){
 	print STDERR 2.88meg floppy;
-   $count=2880*1024/$vSecSize;  
+$count=2880*1024/$vSecSize;  
 }
 if( $media == 4 ){
 	print STDERR harddisk;
-	$count=0;
+	$MBR=getSector($imgStart, 1, $imageFile );
+	$partition1=substr($MBR, 446, 16);
+	($unUsed, $firstSector, $partitionSize) = unpack( A8VV, $partition1);
+	$count=$firstSector + $partitionSize;
 }
 print STDERR \n;
 
only in patch2:
unchanged:
--- cdrkit-1.1.11.orig/3rd-party/geteltorito/README.geteltorito
+++ cdrkit-1.1.11/3rd-party/geteltorito/README.geteltorito
@@ -3,8 +3,8 @@
 
 Author: Rainer Krienke
 Email:  krie...@uni-koblenz.de
-License: GPL
-Version: 0.4
+License: GPL v2
+Version: 0.5
 Description: A El Torito boot image extractor
 
 call: 	geteltorito CD-image  toritoimagefile


Bug#651174: python-meld3: Please update to 0.6.7

2011-12-06 Thread Soren Hansen
Package: python-meld3
Severity: normal


meld3 is quite a bit out of date. Can you please update it to 0.6.7?

Best regards, Soren Hansen.

-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-13-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645882: ITP: python-riak -- Python client for Riak

2011-10-19 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@linux2go.dk


* Package name: python-riak
  Version : 1.3.0
  Upstream Author : Basho Technologies r...@basho.com
* URL : https://github.com/basho/riak-python-client
* License : Apache 2.0
  Programming Lang: Python
  Description : Python client for Riak

Riak is a Dynamo-inspired database that is being used in production by
companies like Mozilla and Comcast. Riak scales predictably and easily
and simplifies development by giving users the ability to quickly
prototype, test, and deploy their applications.

A truly fault-tolerant system, Riak has no single point of failure. No
machine is special or central in Riak, so developers and operations
professionals can decide exactly how fault-tolerant they want and need
their applications to be.

This package provides a Python library to talk to Riak



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645897: ITP: nosexcover -- Add Cobertura-style XML coverage report to nose

2011-10-19 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@linux2go.dk


* Package name: nosexcover
  Version : 1.0.7
  Upstream Author : Chris Heisel ch...@heisel.org
* URL : http://pypi.python.org/pypi/nosexcover
* License : BSD
  Programming Lang: Python
  Description : Add Cobertura-style XML coverage report to nose

 A companion to the built-in nose.plugins.cover, this plugin will write
 out an XML coverage report to a file named coverage.xml.
 .
 It will honor all the options you pass to the Nose coverage plugin,
 especially --cover-package.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645899: ITP: nose-exclude -- Exclude specific directories from nosetests runs

2011-10-19 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@linux2go.dk


* Package name: nose-exclude
  Version : 0.1.5
  Upstream Author : Kurt Grandis kgran...@gmail.com
* URL : http://pypi.python.org/pypi/nose-exclude
* License : LGPL
  Programming Lang: Python
  Description : Exclude specific directories from nosetests runs

 nose-exclude is a Nose plugin that allows you to easily specify
 directories to be excluded from testing.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645900: ITP: mongoalchemy -- Document-Object Mapper/Toolkit for Mongo Databases

2011-10-19 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@linux2go.dk


* Package name: mongoalchemy
  Version : 0.9
  Upstream Author : Jeffrey Jenkins j...@qcircles.net
* URL : http://mongoalchemy.org/
* License : MIT/X
  Programming Lang: Python
  Description : Document-Object Mapper/Toolkit for Mongo Databases

 MongoAlchemy is a layer on top of the Python MongoDB driver which adds
 client-side schema definitions, an easier to work with and
 programmatic query language, and a Document-Object mapper which allows
 python objects to be saved and loaded into the database in a type-safe
 way.
 .
 An explicit goal of this project is to be able to perform as many
 operations as possible without having to perform a load/save cycle
 since doing so is both significantly slower and more likely to cause
 data loss.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645901: ITP: lettuce -- Behaviour Driven Development for Python

2011-10-19 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@linux2go.dk


* Package name: lettuce
  Version : 0.1.33
  Upstream Author : Gabriel Falcão gabr...@nacaolivre.org
* URL : http://packages.python.org/lettuce/
* License : GPL
  Programming Lang: Python
  Description : Behaviour Driven Development for Python

 Lettuce is an extremely useful and charming tool for BDD (Behavior
 Driven Development). It can execute plain-text functional descriptions
 as automated tests for Python projects, just as Cucumber does for Ruby.
 .
 Lettuce makes the development and testing process really easy,
 scalable, readable and - what is best - it allows someone who doesn’t
 program to describe the behavior of a certain system, without imagining
 those descriptions will automatically test the system during its
 development.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645902: ITP: kombu-sqlalchemy -- Kombu transport using SQLAlchemy as the message store

2011-10-19 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@linux2go.dk


* Package name: kombu-sqlalchemy
  Version : 1.1.0
  Upstream Author : Ask Solem a...@celeryproject.org
* URL : http://github.com/ask/kombu-sqlalchemy/
* License : BSD
  Programming Lang: Python
  Description : Kombu transport using SQLAlchemy as the message store

This package enables you to use SQLAlchemy as the message store for Kombu.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#645901: ITP: lettuce -- Behaviour Driven Development for Python

2011-10-19 Thread Soren Hansen
2011/10/19 Gergely Nagy alger...@balabit.hu:
 * Package name    : lettuce
 FYI, an RFP with some work already done exists in #587852. You might
 wish to merge the two, and see if any of the work done in the past can
 be reused.

Thanks for spotting this. reportbug failed to get the info from the
BTS and I guess I didn't search hard enough beforehand.

-- 
Soren Hansen        | http://linux2go.dk/
Ubuntu Developer    | http://www.ubuntu.com/
OpenStack Developer | http://www.openstack.org/



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#534709: Unescaped solidus for decoding

2011-06-26 Thread Soren Hansen
Package: python-cjson
Version: 1.0.5-4build1
Severity: normal


I've written a patch that fixes this and is resonably fast. I'm sure
there are faster ways to do this, but this is about how much time I'm
willing to spend on it :)

-- no debconf information
Index: python-cjson-1.0.5/cjson.c
=== ---
python-cjson-1.0.5.orig/cjson.c +++ python-cjson-1.0.5/cjson.c @@ -19,6
+19,9 @@ int  all_unicode; // make all output strings unicode if true }
JSONData;
 
+unsigned int *strutil_remove_index(unsigned int *arr, size_t *num_elements, int index);
+char *strutil_do_removal(const char *s_in, size_t s_in_len, unsigned int *mask, size_t num_elements);
+
 static PyObject* encode_object(PyObject *object);
 static PyObject* encode_string(PyObject *object);
 static PyObject* encode_unicode(PyObject *object);
@@ -120,9 +123,12 @@
 int c, escaping, has_unicode, string_escape;
 Py_ssize_t len;
 char *ptr;
+unsigned int *escaped_solidus_mask = NULL;
+size_t escaped_solidus_mask_size = 0;
 
 // look for the closing quote
 escaping = has_unicode = string_escape = False;
+
 ptr = jsondata-ptr + 1;
 while (True) {
 c = *ptr;
@@ -145,6 +151,11 @@
 case 'u':
 has_unicode = True;
 break;
+case '/':
+escaped_solidus_mask = strutil_remove_index(escaped_solidus_mask,
+escaped_solidus_mask_size,
+ptr - jsondata-ptr - 2);
+/* Intentionally not break'ing */
 case '':
 case 'r':
 case 'n':
@@ -164,9 +175,22 @@
 
 if (has_unicode || jsondata-all_unicode)
 object = PyUnicode_DecodeUnicodeEscape(jsondata-ptr+1, len, NULL);
-else if (string_escape)
-object = PyString_DecodeEscape(jsondata-ptr+1, len, NULL, 0, NULL);
-else
+else if (string_escape) {
+char *s;
+s = jsondata-ptr+1;
+
+if (escaped_solidus_mask_size) {
+s = strutil_do_removal(s, len, escaped_solidus_mask, escaped_solidus_mask_size);
+len = len - escaped_solidus_mask_size;
+}
+
+object = PyString_DecodeEscape(s, len, NULL, 0, NULL);
+
+if (escaped_solidus_mask_size) {
+free(s);
+free(escaped_solidus_mask);
+}
+} else
 object = PyString_FromStringAndSize(jsondata-ptr+1, len);
 
 if (object == NULL) {
Index: python-cjson-1.0.5/jsontest.py
===
--- python-cjson-1.0.5.orig/jsontest.py
+++ python-cjson-1.0.5/jsontest.py
@@ -91,6 +91,12 @@
 s = cjson.encode(r'/')
 self.assertEqual(r'\/', _removeWhitespace(s))
 
+#Disabled by Soren Hansen. It's supposed to be escaped,
+#so verifying that it isn't is nonsense.
+#def testWriteNonEscapedSolidus(self):
+#s = cjson.encode(r'/')
+#self.assertEqual(r'/', _removeWhitespace(s))
+
 def testWriteEscapedReverseSolidus(self):
 s = cjson.encode(\\)
 self.assertEqual(r'\\', _removeWhitespace(s))
Index: python-cjson-1.0.5/strutil.c
===
--- /dev/null
+++ python-cjson-1.0.5/strutil.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 Dan Pascu. See LICENSE for details.
+ * Author: Soren Hansen so...@linux2go.dk
+ *
+ * Utility functions for cjson (kept separate to make unit testing easier).
+ *
+ * To run the tests:
+ * ./test_strutil.sh
+ *
+ * Disclaimer:
+ * I don't think it is very pretty. At all. I do think it's pretty fast,
+ * though.
+ */
+
+#include math.h
+#include stdlib.h
+#include stdio.h
+#include assert.h
+#include string.h
+
+#define ARRAY_SIZE_INCREMENTS 256
+
+static size_t size_to_allocate(int bit);
+unsigned int *strutil_remove_index(unsigned int *arr, size_t *num_elements, int index);
+char *strutil_do_removal(const char *s_in, size_t s_in_len, unsigned int *mask, size_t num_elements);
+
+static size_t
+size_to_allocate(int num_elements) {
+return (((num_elements+255)/ARRAY_SIZE_INCREMENTS))*ARRAY_SIZE_INCREMENTS;
+}
+
+unsigned int *strutil_remove_index(unsigned int *arr, size_t *num_elements, int index) {
+size_t required_size;
+
+required_size = size_to_allocate(*num_elements+1);
+if (required_size  size_to_allocate(*num_elements)) {
+if ((arr = realloc(arr, sizeof(int)*required_size)) == NULL)
+return NULL;
+}
+arr[(*num_elements)++] = index;
+return arr;
+}
+
+char *strutil_do_removal(const char *s_in, size_t s_in_len,
+ unsigned int *arr, size_t num_elements) {
+const char *in_ptr;
+char *s_out = malloc(s_in_len - num_elements);
+char *out_ptr;
+int i = 0;
+int last_index = s_in_len;
+int width;
+
+/* Point to last element of each

Bug#620018: Openstack Compute nova, Cactus release, Squeeze built available in our private repo

2011-04-18 Thread Soren Hansen
2011/4/18 Thomas Goirand tho...@goirand.fr:
 On 04/18/2011 05:29 AM, Soren Hansen wrote:
 2011/4/16 Thomas Goirand tho...@goirand.fr:
 On 04/16/2011 01:32 PM, Lucas Nussbaum wrote:
 On 16/04/11 at 10:43 +0800, Thomas Goirand wrote:
 What the state of collaboration with the upstream packagers?
 Replied more extensively privately to that one.

 This, even more than your constant lecturing on Debian policy, frankly
 pisses me off.
 What are you referring about for the policy?

I've lost count of the times you've tried to lecture me on what is
forbidden, how this or that absolutely must be, etc. Even if you were
always correct, it's extremely frustrating and disrespectful that you
always assume ignorance.  I'm well aware that all our executables should
have man pages. I'm well aware that we can't ship a patched ajaxterm in
our packages. I'm well aware of what should go in a package's
description.  I'm well aware of the meaning of a dependency vs. a
recommended package.  I also have a pretty good idea which of those
things are blockers (like, say, shipping a patched ajaxterm instead of
using the system one) and which ones aren't (e.g. a missing dependency).
I consider myself a rather experienced packager, but I feel you're
treating me like a rookie packager who as never read the Debian Policy.

 All I've been fixing aren't *my* lecture of the policy, but the ones
 of *lintian*. There's no way I'm going to upload something in the
 Debian archive if lintian warns me about anything.

That's fine. Making the package lintian is a great goal! It really is.
Personally, I subscribe to the idea that perfect is the enemy of good
enough. Had I spent a couple of extra days fixing every tiny little
detail about the packaging, there'd 27 other bugs in OpenStack itself
that wouldn't have been fixed. That doesn't mean that I don't know that
there's more work to be done, just like I know the same is true for
OpenStack. At the end of the day, I need to decide what is more
critical. Our packages worked, and aside from not cleaning up very
thoroughly after themselves on removal, I don't think any of the issues
with the packages would be considered RC problems.

 Now, you are telling 2 things that are opposing each other. You are
 saying that my constant lecturing on Debian policy above, and below
 that you need more discussions about my proposed merges with you. Most
 of my changes are to be policy compliant. So, please choose one of the
 two and stick to it.

most being the operative word. You've proposed a bunch of changes, all
of them in the same branch. You've asked me to review and pull that
branch. I've found changes I disagree with, so I ask you to fix them
before I pull. I'd be happy to review and merge your changes piecemeal
if you would simply propose them that way.

Also, even though I asked you not to, you went and rebased your branch,
so I had to start over with my review. That cost me quite a bit of time.

 If you have something to say, at the very least have the guts to say
 it in public
 I did. What I added privately to Lucas was mostly that I had bad
 feelings for the future,

If you think there are problems with our collaboration, *we* are the
people you should be discussing with. How else are we going to address
it?

 because of reactions like this:
 otherwise this collaboration ends right here.
 which I wanted to avoid, knowing already how quick you can be to
 react.

Admittedly, I get upset and extremely frustrated when people have issues
with me or my work, but instead of confronting me, discuss it with other
people. It's exactly how our collaboration started (instead of
discussing changes with me, you posted on debian-devel to find other
people who wanted to help fix my work). It's disrespectful and it's
frustrating that we can't move past that sort of workflow.

 What I wrote as well, is that it seemed to me that Debian was not your
 priority. Am I wrong with that?

I'm not sure how to answer that. Getting Openstack into Debian is on my
list of goals. It's not at the top, because, you know, there can only be
one thing at the top. I'm not sure whether that amounts to a yes or
no to your question.

 But in short: my patches were not pulled, and I hope to get more
 feedback and reactivity from upstream packagers in the future.
 It would be quite helpful if you'd either a) follow the same process
 as everyone else and submit a merge proposal when you have something
 ready for review or at least b) let me know whenever you expect me to
 review your stuff.
 I did b), multiple times, on both IRC and email. You agreed on the
 discussed changes, which is why I didn't get why my proposed changes
 were not pulled.

Because I disagree with some of them, and you've proposed them as one,
great big branch.

 Every once in a while, I've gone and looked and have given you
 feedback.
 I agree I had the feedback 2 weeks ago, yes. I can even add that I was
 quite happy to discuss my changes with you. But that's it, it ended

Bug#620018: Openstack Compute nova, Cactus release, Squeeze built available in our private repo

2011-04-18 Thread Soren Hansen
2011/4/18 Thomas Goirand tho...@goirand.fr:
 As for the fact that you had to release it with a schedule date, I
 *guessed* it myself. Only, saying it explicitly would have helped
 communication.

Sorry, I don't understand what you're saying here.

 most being the operative word. You've proposed a bunch of changes,
 all of them in the same branch.
 Can't you just pull each individual patches that you feel ok with?  Is
 it simply not technically possible with bzr?

Short answer: no. Longer answer: Of course it's possible to extract
individual patches and apply them elsewhere, but it's tedious, manual
and throws away history. We bzr users care deeply about history :)

 Or is it that with bzr, you can only do a big merge of a given branch?

That's the common workflow.

 So, in the future, I should do one branch per proposed merge, for each
 individual topic, right? That's really not convenient,

It's really not very complicated. bzr branch trunk some-branch-name,
hack, bzr push lp:~soren/nova/some-branch-name. Done.

 but I can do that if it is a bzr requirement, so that we can work
 faster this way...

That would be great, thanks.

 Also, even though I asked you not to, you went and rebased your
 branch, so I had to start over with my review. That cost me quite a
 bit of time.
 I did it, because I thought it would *ease* your work, with each
 individual patch being one a single commit, so that you would
 cherry-pick the one that you would feel ok with.

 Now, I do understand that doesn't fit the work-flow of bzr, and that I
 have to deal with so many small branches. Right?

Branches are by far the most convenient way to provide patches, yes.
That's how we handle everything else in Openstack.

 I do now understand what you want/need. Many tiny little branches.
 I'll do that in the future. I hope you can bare with that (first and
 last) big one.

Yeah, I think we're pretty close on that one now.

-- 
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#620018: Openstack Compute nova, Cactus release, Squeeze built available in our private repo

2011-04-17 Thread Soren Hansen
2011/4/16 Thomas Goirand tho...@goirand.fr:
 On 04/16/2011 01:32 PM, Lucas Nussbaum wrote:
 On 16/04/11 at 10:43 +0800, Thomas Goirand wrote:
 What the state of collaboration with the upstream packagers?
 Replied more extensively privately to that one.

This, even more than your constant lecturing on Debian policy, frankly
pisses me off.

If you have something to say, at the very least have the guts to say
it in public, otherwise this collaboration ends right here.

 But in short: my patches were not pulled, and I hope to get more feedback and 
 reactivity from
 upstream packagers in the future.

It would be quite helpful if you'd either a) follow the same process
as everyone else and submit a merge proposal when you have something
ready for review or at least b) let me know whenever you expect me to
review your stuff. Every once in a while, I've gone and looked and
have given you feedback. If you expect more than that, I suggest you
discuss it with me instead of being passive aggressive in other fora
about it.

 It hasn't been great so far,

I agree.

-- 
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#620018: Openstack Compute nova, Cactus release, Squeeze built available in our private repo

2011-04-17 Thread Soren Hansen
2011/4/18 Clint Adams cl...@debian.org:
 On Sun, Apr 17, 2011 at 11:29:07PM +0200, Soren Hansen wrote:
 This, even more than your constant lecturing on Debian policy, frankly
 pisses me off.

 If you have something to say, at the very least have the guts to say
 it in public, otherwise this collaboration ends right here.
 I find it refreshing that you are flouting the Ubuntu Code of Conduct
 so spectacularly.

The Ubuntu code of conduct doesn't say that you have to put up with
whatever other people throw at you, nor does it say that you cannot
express your dissatisfaction with things.

-- 
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#620789: Add a simple token-based access control system to ajaxterm

2011-04-04 Thread Soren Hansen
Package: ajaxterm
Version: 0.10-10
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch


OpenStack is being packaged for Debian. OpenStack ships a patched
ajaxterm. Naturally, we don't want to ship that in the OpenStack Debian
packages, so this is the first of two patches that we need in the
ajaxterm package to support OpenStack.

This patch adds a simple, token based access control system.

It is only enabled if passing a (new) CLI option, namely -t.

If passed on the command line, the given token must be used when
accessing ajaxterm (by adding a ?token=something request argument).

Thanks for considering the patch.


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-7-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ajaxterm-0.10/debian/patches/90_token_based_access_control.diff ajaxterm-0.10/debian/patches/90_token_based_access_control.diff
--- ajaxterm-0.10/debian/patches/90_token_based_access_control.diff	1970-01-01 01:00:00.0 +0100
+++ ajaxterm-0.10/debian/patches/90_token_based_access_control.diff	2011-03-23 15:16:10.0 +0100
@@ -0,0 +1,47 @@
+Index: ajaxterm-0.10/ajaxterm.py
+===
+--- ajaxterm-0.10.orig/ajaxterm.py	2011-03-23 14:18:54.846591114 +0100
 ajaxterm-0.10/ajaxterm.py	2011-03-23 15:16:06.281623963 +0100
+@@ -503,8 +503,9 @@
+ pass
+ 
+ class AjaxTerm:
+-	def __init__(self,cmd=None,index_file='ajaxterm.html',serverport=None):
++	def __init__(self,cmd=None,index_file='ajaxterm.html',serverport=None,token=None):
+ 		self.files={}
++		self.token=token
+ 		for i in ['css','html','js']:
+ 			for j in glob.glob('*.%s'%i):
+ self.files[j]=file(j).read()
+@@ -576,11 +577,13 @@
+ 			if n in self.files:
+ req.response_headers['Content-Type'] = self.mime.get(os.path.splitext(n)[1].lower(), 'application/octet-stream')
+ req.write(self.files[n])
+-			else:
++			elif (not self.token) or (req.REQUEST['token'] == self.token):
+ if self.cookie_name not in req.request_cookies:
+ self.genSidCookie(req)
+ req.response_headers['Content-Type'] = 'text/html; charset=UTF-8'
+ req.write(self.files['index'])
++			else:
++raise Exception('Not Authorized')
+ 		return req
+ 	def genSidCookie(self, req):
+ 		m = sha1()
+@@ -605,6 +608,7 @@
+ 	parser.add_option(-i, --index, dest=index_file, default=ajaxterm.html,help=default index file (default: ajaxterm.html))
+ 	parser.add_option(-u, --uid, dest=uid, help=Set the daemon's user id)
+ 	parser.add_option(-s, --serverport, dest=serverport, help=Use a different port than 22 to connect to the ssh server)
++	parser.add_option(-t, --token, dest=token, help=Set authorization token)
+ 	(o, a) = parser.parse_args()
+ 	if o.daemon:
+ 		pid=os.fork()
+@@ -630,7 +634,7 @@
+ 			sys.exit(0)
+ 	else:
+ 		print 'AjaxTerm at http://localhost:%s/' % o.port
+-	at=AjaxTerm(o.cmd,o.index_file,o.serverport)
++	at=AjaxTerm(o.cmd,o.index_file,o.serverport,o.token)
+ #	f=lambda:os.system('firefox http://localhost:%s/;'%o.port)
+ #	qweb.qweb_wsgi_autorun(at,ip='localhost',port=int(o.port),threaded=0,log=o.log,callback_ready=None)
+ 	try:
diff -Nru ajaxterm-0.10/debian/patches/series ajaxterm-0.10/debian/patches/series
--- ajaxterm-0.10/debian/patches/series	2011-02-13 21:32:58.0 +0100
+++ ajaxterm-0.10/debian/patches/series	2011-03-23 14:02:30.0 +0100
@@ -12,3 +12,4 @@
 30_utf8-support.diff
 35_fix-sarissa.diff
 40_more-ctrl-catches.diff
+90_token_based_access_control.diff


Bug#620790: ajaxterm: Improper escaping of command arguments in /usr/bin wrapper

2011-04-04 Thread Soren Hansen
Package: ajaxterm
Version: 0.10-10
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

/usr/bin/ajaxterm calls /usr/share/ajaxterm/ajaxterm.py like so:
exec $PYTHONPATH/ajaxterm.py $@

If I run something like
ajaxterm --cmd vmstat 5

The argv ends up being ajaxterm, --cmd, vmstat, 5 which obvisously 
won't work.

Thanks for considering the patch.


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-7-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ajaxterm-0.10/debian/changelog ajaxterm-0.10/debian/changelog
diff -Nru ajaxterm-0.10/debian/patches/01_bin_dir.diff ajaxterm-0.10/debian/patches/01_bin_dir.diff
--- ajaxterm-0.10/debian/patches/01_bin_dir.diff	2011-02-13 21:32:58.0 +0100
+++ ajaxterm-0.10/debian/patches/01_bin_dir.diff	2011-04-04 10:16:27.0 +0200
@@ -1,10 +1,12 @@
 Description: Fix binary location for Debian
 Author: Julien Valroff jul...@debian.org
 
 a/configure.ajaxterm.bin
-+++ b/configure.ajaxterm.bin
+Index: ajaxterm-0.10/configure.ajaxterm.bin
+===
+--- ajaxterm-0.10.orig/configure.ajaxterm.bin
 ajaxterm-0.10/configure.ajaxterm.bin
 @@ -1,2 +1,3 @@
  #!/bin/sh
 -PYTHONPATH=%(lib)s exec %(lib)s/ajaxterm.py $@
 +PYTHONPATH=/usr/share/ajaxterm
-+exec $PYTHONPATH/ajaxterm.py $@
++exec $PYTHONPATH/ajaxterm.py $@


Bug#620791: Add a global timeout option to ajaxterm

2011-04-04 Thread Soren Hansen
Package: ajaxterm
Version: 0.10-10
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

OpenStack is being packaged for Debian. OpenStack ships a patched
ajaxterm. Naturally, we don't want to ship that in the OpenStack Debian
packages, so this is the second of two patches that we need in the
ajaxterm package to support OpenStack.

Add a -T option to terminate ajaxterm itself (different from the
existing timeout code which reaps dead connections). This ensures we
don't leave stale ajaxterm servers around.

Thanks for considering the patch.


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-7-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ajaxterm-0.10/debian/patches/91_terminate_on_idle.diff ajaxterm-0.10/debian/patches/91_terminate_on_idle.diff
--- ajaxterm-0.10/debian/patches/91_terminate_on_idle.diff	1970-01-01 01:00:00.0 +0100
+++ ajaxterm-0.10/debian/patches/91_terminate_on_idle.diff	2011-03-23 15:15:35.0 +0100
@@ -0,0 +1,91 @@
+Index: ajaxterm-0.10/ajaxterm.py
+===
+--- ajaxterm-0.10.orig/ajaxterm.py	2011-03-23 15:13:53.861429744 +0100
 ajaxterm-0.10/ajaxterm.py	2011-03-23 15:15:27.491567073 +0100
+@@ -29,6 +29,8 @@
+ from socket import gethostname
+ 
+ 
++global g_server
++
+ def debug(str):
+ 	now = datetime.datetime.now()
+ 	print %s - %s % (now.isoformat(), str)
+@@ -395,7 +397,7 @@
+ class Multiplex:
+ 	INACTIVE_PROCESS_TIMEOUT=120# I guess this is the IP max packet lifetime
+ 
+-	def __init__(self,cmd=None,serverport=None):
++	def __init__(self,cmd=None,serverport=None,term_on_idle=0):
+ 		signal.signal(signal.SIGCHLD, signal.SIG_IGN)
+ 		self.cmd=cmd
+ 		self.serverport=serverport
+@@ -403,6 +405,8 @@
+ 		self.lock=threading.RLock()
+ 		self.thread=threading.Thread(target=self.loop)
+ 		self.alive=1
++ 		self.term_on_idle = term_on_idle
++		self.lastActivity=time.time()
+ 		# synchronize methods
+ 		for name in ['create','fds','proc_read','proc_write','dump','die','run']:
+ 			orig=getattr(self,name)
+@@ -493,6 +497,9 @@
+ 		while self.run():
+ 			fds=self.fds()
+ 			i,o,e=select.select(fds, [], [], 1.0)
++			if self.term_on_idle and time.time() - self.lastActivity  self.term_on_idle:
++global g_server
++g_server.shutdown()
+ 			for fd in i:
+ self.proc_read(fd)
+ 			if len(i):
+@@ -505,7 +512,7 @@
+ pass
+ 
+ class AjaxTerm:
+-	def __init__(self,cmd=None,index_file='ajaxterm.html',serverport=None,token=None):
++	def __init__(self,cmd=None,index_file='ajaxterm.html',serverport=None,token=None,term_on_idle=0):
+ 		self.files={}
+ 		self.token=token
+ 		for i in ['css','html','js']:
+@@ -514,7 +521,7 @@
+ 		self.files['index']=file(index_file).read()
+ 		self.mime = mimetypes.types_map.copy()
+ 		self.mime['.html']= 'text/html; charset=UTF-8'
+-		self.multi = Multiplex(cmd,serverport)
++		self.multi = Multiplex(cmd,serverport,term_on_idle)
+ 		self.reaper = Reaper(self.multi)
+ 		self.session = {}
+ 		self.session_ip = {}
+@@ -565,6 +572,7 @@
+ 			if k:
+ self.multi.proc_write(term,k)
+ 			time.sleep(0.002)
++			self.multi.lastActivity = time.time()
+ 			dump=self.multi.dump(term,c)
+ 			if isinstance(dump,str):
+ req.write(dump)
+@@ -611,6 +619,7 @@
+ 	parser.add_option(-u, --uid, dest=uid, help=Set the daemon's user id)
+ 	parser.add_option(-s, --serverport, dest=serverport, help=Use a different port than 22 to connect to the ssh server)
+ 	parser.add_option(-t, --token, dest=token, help=Set authorization token)
++	parser.add_option(-T, --terminate-on-idle, metavar=SEC, action=store, type=int, dest=term_on_idle, help=Terminate if idle for more than SEC seconds (0 means never))
+ 	(o, a) = parser.parse_args()
+ 	if o.daemon:
+ 		pid=os.fork()
+@@ -636,11 +645,13 @@
+ 			sys.exit(0)
+ 	else:
+ 		print 'AjaxTerm at http://localhost:%s/' % o.port
+-	at=AjaxTerm(o.cmd,o.index_file,o.serverport,o.token)
++	at=AjaxTerm(o.cmd,o.index_file,o.serverport,o.token,o.term_on_idle)
+ #	f=lambda:os.system('firefox http://localhost:%s/;'%o.port)
+ #	qweb.qweb_wsgi_autorun(at,ip='localhost',port=int(o.port),threaded=0,log=o.log,callback_ready=None)
+ 	try:
+-		qweb.QWebWSGIServer(at,ip='localhost',port=int(o.port),threaded=1,log=o.log).serve_forever()
++		global g_server
++		g_server = qweb.QWebWSGIServer(at,ip='localhost',port=int(o.port),threaded=1,log=o.log)
++		g_server.serve_forever()
+ 	except KeyboardInterrupt,e:
+ 		sys.excepthook(*sys.exc_info())
+ 	at.multi.die()
diff -Nru ajaxterm-0.10/debian/patches/series ajaxterm-0.10/debian/patches/series
--- ajaxterm-0.10/debian/patches/series	2011-02-13 21:32:58.0 +0100
+++ ajaxterm-0.10/debian/patches/series	2011-03-23 14:02:30.0 +0100

Bug#577040: Why let upstart take precedence?

2011-03-28 Thread Soren Hansen
What doesn't seem entirely clear to me, is why the upstart jobs take
precedence over sysvinit style boot scripts? It seems clear that Debian
prefers non-upstart over upstart (upstart being Priority: extra, and
insserv being the default pid 1 in Debian), so it would seem more
sensible to me to prefer init style boot scripts over upstart jobs.

Specifically, it makes it difficult to share efforts for packaging on
Ubuntu and Debian, since in Ubuntu we might want upstart jobs, but
adding them to the packaging results in (almost) uninstallable packages
in Debian, due to the dependency on upstart-job added by dh_installinit.

-- 
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#598463: Alive

2010-12-08 Thread Soren Hansen
Hi.

I'm the maintainer. I'll readily admit I've failed miserably to
track this issue appropriately.
Part of it is due to some rather unfortunate e-mail filtering, but
that's certainly not all. (Debian bug mail ended in a folder I didn't
subscribe to, but I noticed the issue when it was first raised on the
libcloud list)

I've had no time to drive this issue personally, but idly following
the upstream libcloud mailing list (where Pietro has done  a great job
trying to get things moving), there doesn't seem to be any resolution.
The final e-mail in the thread (AFAIK) being this:


http://mail-archives.apache.org/mod_mbox/incubator-libcloud/201011.mbox/%3caanlkti=x9nfbv7igzcakwuqoumoe-j1tk6duw3y6a...@mail.gmail.com%3e

I was sort of hoping it would be resolved soon so that we could get
the fix in. I didn't see much point in getting 0.4 into squeeze since
this issue would remain. (Was that wrong?)

I agree the issue is important. I'm not sure I personally think it
warrants removal, but if that's how things are done, that's of course
fine.

On a more general note, I'm going to thoroughly reconsider my
maintaining this package. I don't really use it anymore, and if I did,
it wouldn't be on Debian, so if anyone else wants to take it over,
that'd be great. If not, it'll be on a best-effort basis, were best
probably isn't going to be very awesome :(

-- 
Soren Hansen



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#590700: python-redis 2.0.0 is out

2010-07-28 Thread Soren Hansen
Package: python-redis
Version: 1.34.1+git20100401235334-1
Severity: normal

python-redis 2.0.0 was released on June 28th. Can you update the package,
please? Thanks!



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#588284: ITP: python-gflags -- Python implementation of the Google commandline flags module

2010-07-06 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@ubuntu.com


* Package name: python-gflags
  Version : 1.3
  Upstream Author : Google Inc. opensou...@google.com
* URL : http://code.google.com/p/google-gflags
* License : BSD
  Programming Lang: Python
  Description : Python implementation of the Google commandline flags module

GFlags defines a *distributed* command line system, replacing systems like
getopt(), optparse and manual argument processing. Rather than an application
having to define all flags in or near main(), each Python module defines flags
that are useful to it.  When one Python module imports another, it gains
access to the other's flags.

It includes the ability to define flag types (boolean, float, interger, list),
autogeneration of help (in both human and machine readable format) and reading
arguments from a file. It also includes the ability to automatically generate
man pages from the help flags.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#528047: check: AM_PATH_CHECK() exhausts memory

2010-05-31 Thread Soren Hansen
I believe this bug is

a) completely and trivially reproducible,
b) critical,
c) and a duplicate of #581354.

To reproduce, simply create a configure.ac with just one line:

AM_PATH_CHECK

..and run aclocal.

This breaks any and all projects that use the AM_PATH_CHECK macro and
happen to have to run aclocal.

Furthermore, I don't understand what motivated your change in check.m4?
Reverting that part of the diff fixes the problem completely.

-- 
Soren Hansen
Ubuntu Developer
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#500716: Status of ITP: opennebula

2010-04-21 Thread Soren Hansen
On Tue, Apr 13, 2010 at 09:39:41PM +0200, Damien Raude-Morvan wrote:
 I'm looking for status of Debian OpenNebula packaging effort.

I was working on it at some point, but my job responsibilites changed,
and I couldn't spend time on it anymore.

 - Is there an $VCS somewhere with current Debian package ?

There's the package in Ubuntu. I think that's the current best bet. I
have some code lying around for 1.4 that I never finished enough that I
wanted to get it sponsored into Debian, so it just went stale. I can try
to dig it out from the depths of $HOME/src somewhere.

 - Is https://launchpad.net/opennebula dead ? (no upload since
 2009-10-27)

That's probably due to the fact that upstream moved their VCS to git.
I've added a new code import for that, it should be pulled soon. Thanks
for the nudge.

 I would like to give a hand.

Any help would be greatly appreciated.

-- 
Soren Hansen
Ubuntu Developer
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#576310: ITP: python-cloudservers -- Python bindings for Rackspace's Cloud Servers API

2010-04-02 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@linux2go.dk

* Package name: python-cloudservers
  Version : 1.0a5
  Upstream Author : Jacob Kaplan-Moss ja...@jacobian.org
* URL : http://pypi.python.org/pypi/python-cloudservers/
* License : BSD
  Programming Lang: Python
  Description : Python bindings for Rackspace's Cloud Servers API

Python library for interacting with Rackspace's Cloud Servers, as well
as a CLI tool. They both implement 100% of the Cloud Servers API.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#560317: dpkg-trigger complains at dpkg-reconfigure time

2010-03-09 Thread Soren Hansen
FWIW, I wrote a patch a long time ago in an attempt to fix this.

   
http://bazaar.launchpad.net/~soren/debconf/dpkg-trigger-bug-198421/revision/618?remember=616compare_revid=616

The bzr branch is at:

   https://code.launchpad.net/~soren/debconf/dpkg-trigger-bug-198421

-- 
Soren Hansen
Ubuntu Developer
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#555006: ITP: libcloud -- a unified interface to the cloud

2009-11-07 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@ubuntu.com


* Package name: libcloud
  Version : 0.1.1~git20091107
  Upstream Author : Alex Polvi po...@cloudkick.com
* URL : http://www.libcloud.org/
* License : Apache2
  Programming Lang: Python
  Description : a unified interface to the cloud
libcloud is a pure Python client library for interacting with many of
the popular cloud server providers. It was created to make it easy for
developers to build products that work between any of the services that
it supports.
.
libcloud was originally created by the folks over at Cloudkick, but has
since grown into an independent free software project licensed under
the Apache License (2.0).



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#554048: ITP: python-mhash -- Python bindings for libmhash

2009-11-02 Thread Soren Hansen
Package: wnpp
Severity: wishlist
Owner: Soren Hansen so...@ubuntu.com


* Package name: python-mhash
  Version : 1.4
  Upstream Author : Gustavo Niemeyer gust...@niemeyer.net
* URL : http://labix.org/python-mhash
* License : LGPL 2.1+
  Programming Lang: C, Python
  Description : Python bindings for libmhash

python-mhash is a comprehensive Python interface to the mhash library,
which provides a uniform interface to access several hashing algorithms
such as MD4, MD5, SHA1, SHA160, and many others.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#500674: iptables: non-relevant documentation included

2008-11-14 Thread Soren Hansen
 Iptables on lenny still seems to include the old NAT-HOWTO and
 packet-filtering howtos for kernel 2.4 series.

 Since Lenny won't support 2.4 anymore, this docs are not relevant and
 even misleading (it *seems* iptables includes proper documentation
 when that's not the case).

I think this is a mistake and should be reverted. As far as I can see,
the docs clearly state that they're for Linux 2.4 *and onwards*.
iptables was introduced in Linux 2.4, and unlike Linux 2.2 and Linux
2.4, the Linux 2.6 series didn't introduce a new packet filtering
system, so it's the same as in Linux 2.4.

I glanced at the offending docs, and -- at a glance at least -- they
look to be valid still.

The only thing that seems to only mention 2.4 is the doc-base stuff.
Here's a patch to fix this (against 1.4.1.1-3):

Index: iptables-1.4.1.1/debian/iptables.doc-base.nat
===
--- iptables-1.4.1.1.orig/debian/iptables.doc-base.nat  2008-11-14 
17:19:59.926553140 +0100
+++ iptables-1.4.1.1/debian/iptables.doc-base.nat   2008-11-14 
17:20:21.648947677 +0100
@@ -1,5 +1,5 @@
 Document: nat
-Title: Linux 2.4 NAT HOWTO
+Title: Linux 2.4/2.6 NAT HOWTO
 Author: Rusty Russell
 Abstract: This document describes how to do masquerading, transparent 
  proxying, port forwarding, and other forms of Network Address 
Index: iptables-1.4.1.1/debian/iptables.doc-base.packet-filter
===
--- iptables-1.4.1.1.orig/debian/iptables.doc-base.packet-filter
2008-11-14 17:19:59.990553103 +0100
+++ iptables-1.4.1.1/debian/iptables.doc-base.packet-filter 2008-11-14 
17:20:29.717551157 +0100
@@ -1,5 +1,5 @@
 Document: packet-filter
-Title: Linux 2.4 Packet Filtering HOWTO
+Title: Linux 2.4/2.6 Packet Filtering HOWTO
 Author: Rusty Russell
 Abstract: This document describes how to use iptables to filter 
  IP packets for the 2.4+ Linux kernels.

-- 
Soren Hansen   | 
Virtualisation specialist  | Ubuntu Server Team
Canonical Ltd. | http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#473567: listadmin: Add support for Danish mailman instances

2008-03-31 Thread Soren Hansen
Package: listadmin
Version: 2.40-1
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1



In Ubuntu, we've applied the attached patch to achieve the following:

  * Added support for Danish mailman interfaces.

We thought you might be interested in doing the same. 

(I already sent the patch to upstream back in December 2007)


- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-12-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFH8NGMonjfXui9pOMRArDUAJ9nAO4oUzREmsCwNiQ7QB0X/DY4iwCaAg19
Zwlut541+DYJV79DjOf8I8Y=
=mkBM
-END PGP SIGNATURE-
diff -u listadmin-2.40/debian/changelog listadmin-2.40/debian/changelog
--- listadmin-2.40.orig/listadmin.pl
+++ listadmin-2.40/listadmin.pl
@@ -835,28 +835,34 @@
  en = authentication,
  de = Authentifikation,
  fr = authentification,
+ da = Login,
 },
 subscr_success =
 {
  en = Successfully ((un)?subscribed|Removed),
  de = Erfolgreich (ein|aus)getragen,
+ da = (Til|Fra)melding (er sket|udf.*rt):,
 },
 subscr_error =
 {
  en = Error (un)?subscribing,
+ da = Fejl under (til|fra)melding,
 },
 no_such_list =
 {
  en = Mailman Admindb Error.*No such list:,
+ da = Listen findes ikke,
 },
 pending_req =
 {
  en = (current set of administrative|pending request),
  de = (gegenwauml;rtigen administrativen|unbearbeiteten 
Anfragen),
+ da = (Administrative anmodninger|ingen anmodninger),
 },
 headline_subscr =
 {
  en = subscription,
+ da = medlemskab,
 },
 held_for_approval =
 {
@@ -865,6 +871,7 @@
 already_member =
 {
  en = Already a member,
+ da = Allerede medlem,
 },
);
 


Bug#473117: dnsmasq: use log_*_msg rather than echo in init script

2008-03-28 Thread Soren Hansen
Package: dnsmasq
Version: 2.41-2
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

In Ubuntu, we've applied the attached patch to make the init script lsb
compliant.

We thought you might be interested in doing the same. 


- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-12-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFH7Ol2onjfXui9pOMRAnqDAJ4izc93G7ntiShjDMs5t7cDax+hBgCgrJG7
o6CSdwSrAaVa6rPGm1njlkE=
=Sre7
-END PGP SIGNATURE-
diff -u dnsmasq-2.41/debian/init dnsmasq-2.41/debian/init
--- dnsmasq-2.41/debian/init
+++ dnsmasq-2.41/debian/init
@@ -26,6 +26,8 @@
 test $ENABLED != 0 || exit 0
 test -x $DAEMON || exit 0
 
+. /lib/lsb/init-functions
+
 # RESOLV_CONF:
 # If the resolvconf package is installed then use the resolv conf file
 # that it provides as the default.  Otherwise use /etc/resolv.conf as
@@ -131,71 +133,76 @@
 
 case $1 in
   start)
-   echo -n Starting $DESC: $NAME
+   log_daemon_msg Starting $DESC $NAME
start
case $? in
0)
-   echo .
+   log_end_msg 0
start_resolvconf
exit 0
;;
1)
-   echo  (already running).
+   log_warning_msg (already running)
+   log_end_msg 0
exit 0
;;
*)
-   echo  (failed).
+   log_warning_msg failed
+   log_end_msg 1
exit 1
;;
esac
;;
   stop)
stop_resolvconf
-   echo -n Stopping $DESC: $NAME
+   log_daemon_msg Stopping $DESC $NAME
stop
case $? in
-   0) echo . ; exit 0 ;;
-   1) echo  (not running). ; exit 0 ;;
-   *) echo  (failed). ; exit 1 ;;
+   0) log_end_msg 0 ; exit 0 ;;
+   1) log_warning_msg not running ; log_end_msg 0 ; exit 0 ;;
+   *) log_warning_msg failed ; log_end_msg 1 ; exit 1 ;;
esac
;;
   restart|force-reload)
stop_resolvconf
-   echo -n Restarting $DESC: $NAME
+   log_daemon_msg Restarting $DESC $NAME
stop
case $? in
0|1)
start
case $? in
0)
-   echo .
+   log_end_msg 0
start_resolvconf
exit 0
;;
1)
-   echo  (failed -- old process is still 
running).
+   log_warning_msg failed -- old process 
is still running
+   log_end_msg 1
exit 1
;;
*)
-   echo  (failed to start).
+   log_warning_msg failed to start
+   log_end_msg 1
exit 1
;;
esac
;;
*)
-   echo  (failed to stop).
+   log_warning_msg failed to stop
+   log_end_msg 1
exit 1
;;
esac
;;
   status)
-   echo -n Checking $DESC: $NAME
+   log_daemon_msg Checking $DESC $NAME
status
case $? in
-   0) echo  (running) ; exit 0 ;;
-   1) echo  (dead, pid file exists) ; exit 1 ;;
-   3) echo  (not running) ; exit 3 ;;
-   *) echo  (unknown) ; exit 4 ;;
+   0) log_warning_msg running ; log_msg_end 0; exit 0 ;;
+   1) log_warning_msg dead, pid file exists ; log_msg_end 1; 
exit 1 ;;
+   3) log_warning_msg not running ; log_msg_end 3; exit 3 ;;
+   *) log_warning_msg unknown ; log_msg_end 4; exit 4 ;;
esac
;;
   *)


Bug#465570: irssi: authentification is not a word

2008-02-13 Thread Soren Hansen
Package: irssi
Version: 0.8.12-3
Severity: minor
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1



In Ubuntu, we've applied the attached patch to achieve the following:

  * Replace authentification with a less amusing word

We thought you might be interested in doing the same. 


- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-7-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHssx0onjfXui9pOMRAl3CAJ91drsx3oB35vbW9NH8q6ZoFk+qqwCgoLfS
ZeAtBrn0BFqZqlcy/JfOr5o=
=Xqga
-END PGP SIGNATURE-
diff -u irssi-0.8.12/debian/patches/series irssi-0.8.12/debian/patches/series
--- irssi-0.8.12/debian/patches/series
+++ irssi-0.8.12/debian/patches/series
@@ -14,0 +15 @@
+91-manpage-typo
only in patch2:
unchanged:
--- irssi-0.8.12.orig/debian/patches/91-manpage-typo
+++ irssi-0.8.12/debian/patches/91-manpage-typo
@@ -0,0 +1,13 @@
+Index: irssi-0.8.12/docs/irssi.1
+===
+--- irssi-0.8.12.orig/docs/irssi.1 2008-02-08 20:57:07.0 -0500
 irssi-0.8.12/docs/irssi.1  2008-02-08 20:57:29.0 -0500
+@@ -31,7 +31,7 @@
+ .BI \-w, \-\-password=PASSWORD
+ use
+ .I PASSWORD 
+-for authentification.
++for authentication.
+ .TP
+ .BI \-p, \-\-port=PORT
+ automatically connect to 


Bug#465340: dpkg: Broken call to open in Dpkg/Control.pm

2008-02-11 Thread Soren Hansen
Package: dpkg
Version: 1.14.16.6
Severity: important
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


In Ubuntu, we've applied the attached patch to achieve the following:

  * Fix wrong call to open in Dpkg/Control.pm that makes using a different
control file than debian/control fail horribly.

We thought you might be interested in doing the same. 


- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-6-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHsNBxonjfXui9pOMRAtxZAJwOJGRnPBBVuxf+wyjj7heRPh6ldwCfYGKk
gnFO1f8OjTlKg6rp654onUk=
=u9ID
-END PGP SIGNATURE-
diff -Nru /tmp/63ah7FRjAl/dpkg-1.14.16.6ubuntu1/scripts/Dpkg/Control.pm 
/tmp/fQCCS9NM6H/dpkg-1.14.16.6ubuntu2/scripts/Dpkg/Control.pm
--- dpkg-1.14.16.6ubuntu1/scripts/Dpkg/Control.pm   2008-01-18 
11:12:53.0 +0100
+++ dpkg-1.14.16.6ubuntu2/scripts/Dpkg/Control.pm   2008-02-11 
23:20:11.0 +0100
@@ -78,7 +78,7 @@
 my ($self, $file) = @_;
 $self-reset();
 # Parse
-open(CDATA, , $file) || syserr(_g(cannot read %s), $file);
+open(CDATA,  $file) || syserr(_g(cannot read %s), $file);
 my $cdata = parsecdata(\*CDATA, $file);
 return if not defined $cdata;
 $self-{source} = $cdata;


Bug#465340: dpkg: Broken call to open in Dpkg/Control.pm

2008-02-11 Thread Soren Hansen
On Tue, Feb 12, 2008 at 12:25:13AM +0100, Frank Lichtenheld wrote:
 On Mon, Feb 11, 2008 at 11:47:13PM +0100, Soren Hansen wrote:
  diff -Nru /tmp/63ah7FRjAl/dpkg-1.14.16.6ubuntu1/scripts/Dpkg/Control.pm 
  /tmp/fQCCS9NM6H/dpkg-1.14.16.6ubuntu2/scripts/Dpkg/Control.pm
  --- dpkg-1.14.16.6ubuntu1/scripts/Dpkg/Control.pm   2008-01-18 
  11:12:53.0 +0100
  +++ dpkg-1.14.16.6ubuntu2/scripts/Dpkg/Control.pm   2008-02-11 
  23:20:11.0 +0100
  @@ -78,7 +78,7 @@
   my ($self, $file) = @_;
   $self-reset();
   # Parse
  -open(CDATA, , $file) || syserr(_g(cannot read %s), $file);
  +open(CDATA,  $file) || syserr(_g(cannot read %s), $file);
 
 Hmm, whatever problem you saw, this most certainly is not the right fix!
 Both lines are semantically identical... (barring any serious Perl
 bugs).

Granted my perl-fu is not that strong, and looking at the documentation,
I might have exaggerated the extent of this bug somewhat.

 Could you please go into more detail what you tried to fix?  

The particular bug I was fixing was when called with -c-, i.e. read
the control file from stdin. From perldoc:

In the 2-arguments (and 1-argument) form opening '-'  opens STDIN
and opening '-'  opens STDOUT.

Without my patch, it's the 3-argument version of open, so opening -
fails (as there is no such file).

 Error messages? 

From pkg-create-dbgsym:

dpkg-gencontrol: failure: cannot read -: No such file or directory

 Launchpad bug number?

Didn't bother doing the paper work :)

-- 
Soren Hansen
Virtualisation specialist
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#463407: dnsmasq: Please provide no-conf variant

2008-02-05 Thread Soren Hansen
On Tue, Feb 05, 2008 at 07:46:04AM +, Simon Kelley wrote:
 I decided to take a stab at making a patch that implements this. I've
 attaced it here.
 Apologies, I should have acknowledged your bug and saved you the
 effort.

No worries. I enjoyed fiddling with one of the rare debhelperless
packages :)

 dnsmasq-2.41 is close to release and includes what you want.

How close is close? When can I expect it to hit Debian?

-- 
Soren Hansen
Virtualisation specialist
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#463407: dnsmasq: Please provide no-conf variant

2008-02-05 Thread Soren Hansen
On Tue, Feb 05, 2008 at 07:46:04AM +, Simon Kelley wrote:
 Apologies, I should have acknowledged your bug and saved you the
 effort.  dnsmasq-2.41 is close to release and includes what you want.
 http://thekelleys.org.uk/dnsmasq/release-candidates/dnsmasq-2.41rc2.tar.gz

A few comments:

a) The new dnsmasq does not contain any arch dep files, so should
probably be arch: all from now on.

b) /usr/share/doc is completely missing from dnsmasq. The easiest is to
just make /usr/share/doc/dnsmasq a symlink to dnsmasq-base.

c) dnsmasq-base has no /usr/share/doc/dnsmasq-base, but rather a
/usr/share/doc/dnsmasq.

I've attached a patch that fixes all three issues.

-- 
Soren Hansen
Virtualisation specialist
Ubuntu Server Team
http://www.ubuntu.com/
diff -urNw dnsmasq-2.41rc2.orig/debian/control dnsmasq-2.41rc2/debian/control
--- dnsmasq-2.41rc2.orig/debian/control	2008-02-05 14:21:09.995049211 +0100
+++ dnsmasq-2.41rc2/debian/control	2008-02-05 14:21:31.483049072 +0100
@@ -6,8 +6,8 @@
 Maintainer: Simon Kelley [EMAIL PROTECTED]
 Standards-Version: 3.7.2
 
 Package: dnsmasq
-Architecture: any
+Architecture: all
 Depends: netbase, adduser, dnsmasq-base
 Suggests: resolvconf
 Conflicts: pdnsd, resolvconf (1.15)
--- dnsmasq-2.41rc2.orig/debian/rules	2008-02-05 14:21:09.995049211 +0100
+++ dnsmasq-2.41rc2/debian/rules	2008-02-05 14:21:27.035471412 +0100
@@ -9,7 +9,7 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
-package=dnsmasq
+package=dnsmasq-base
 
 # policy manual, section 10.1
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -52,6 +52,7 @@
 	install -d debian/daemon/DEBIAN\
 		-d debian/base/DEBIAN\
 	-d debian/base/usr/share/doc/$(package)\
+	-d debian/daemon/usr/share/doc\
 		-d debian/base/usr/share/doc/$(package)/examples\
 	-d debian/daemon/etc/init.d\
 	-d debian/daemon/etc/resolvconf/update.d\
@@ -66,6 +67,7 @@
 	install -m 644 debian/default debian/daemon/etc/default/dnsmasq
 	install -m 644 dnsmasq.conf.example debian/daemon/etc/dnsmasq.conf
 	install -m 644 dbus/dnsmasq.conf debian/daemon/etc/dbus-1/system.d/dnsmasq.conf
+	ln -s $(package) debian/daemon/usr/share/doc/dnsmasq
 	make $(TARGET) PREFIX=/usr DESTDIR=`pwd`/debian/base CFLAGS=$(CFLAGS) COPTS=$(COPTS) CC=gcc AWK=gawk
 ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
 	cp doc.html debian/base/usr/share/doc/$(package)/.


signature.asc
Description: Digital signature


Bug#463407: dnsmasq: Please provide no-conf variant

2008-02-04 Thread Soren Hansen
I decided to take a stab at making a patch that implements this. I've
attaced it here.

-- 
Soren Hansen
Virtualisation specialist
Ubuntu Server Team
http://www.ubuntu.com/
diff -u dnsmasq-2.40/debian/rules dnsmasq-2.40/debian/rules
--- dnsmasq-2.40/debian/rules
+++ dnsmasq-2.40/debian/rules
@@ -9,8 +9,6 @@
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
-package=dnsmasq
-
 # policy manual, section 10.1
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
  CFLAGS = -g -O0
@@ -43,59 +41,68 @@
 
 clean:
 	$(checkdir)
-	rm -rf debian/tmp debian/*~ debian/files debian/substvars
+	rm -rf debian/dnsmasq debian/dnsmasq-base debian/*~ debian/files debian/substvars
 	make clean
 
 binary-arch:	checkroot 
 	$(checkdir)
-	rm -rf debian/tmp
-	install -d debian/tmp/DEBIAN\
-	-d debian/tmp/usr/share/doc/$(package)\
-		-d debian/tmp/usr/share/doc/$(package)/examples\
-	-d debian/tmp/etc/init.d\
-	-d debian/tmp/etc/resolvconf/update.d\
-	-d debian/tmp/etc/default\
-		-d debian/tmp/etc/dbus-1/system.d\
-	-d debian/tmp/var/run\
-	-d debian/tmp/var/lib/misc
-	install -m 644 debian/conffiles debian/tmp/DEBIAN
-	install -m 755 debian/postinst debian/postrm debian/prerm debian/tmp/DEBIAN
-	install -m 755 debian/init debian/tmp/etc/init.d/dnsmasq
-	install -m 755 debian/resolvconf debian/tmp/etc/resolvconf/update.d/dnsmasq
-	install -m 644 debian/default debian/tmp/etc/default/dnsmasq
-	install -m 644 dnsmasq.conf.example debian/tmp/etc/dnsmasq.conf
-	install -m 644 dbus/dnsmasq.conf debian/tmp/etc/dbus-1/system.d/dnsmasq.conf
-	make $(TARGET) PREFIX=/usr DESTDIR=`pwd`/debian/tmp CFLAGS=$(CFLAGS) COPTS=$(COPTS) CC=gcc
+	for package in dnsmasq dnsmasq-base; do \
+		rm -rf debian/$$package; \
+		install -d debian/$$package/DEBIAN; \
+	done
+	pkg=dnsmasq ; install -d debian/$$pkg/etc/init.d\
+		-d debian/$$pkg/etc/resolvconf/update.d\
+		-d debian/$$pkg/etc/default\
+		-d debian/$$pkg/etc/dbus-1/system.d\
+		-d debian/$$pkg/usr/share/doc;\
+		install -m 644 debian/conffiles debian/$$pkg/DEBIAN;\
+		install -m 755 debian/postinst debian/postrm debian/prerm debian/$$pkg/DEBIAN;\
+		install -m 755 debian/init debian/$$pkg/etc/init.d/dnsmasq;\
+		install -m 755 debian/resolvconf debian/$$pkg/etc/resolvconf/update.d/dnsmasq;\
+		install -m 644 debian/default debian/$$pkg/etc/default/dnsmasq;\
+		install -m 644 dnsmasq.conf.example debian/$$pkg/etc/dnsmasq.conf;\
+		install -m 644 dbus/dnsmasq.conf debian/$$pkg/etc/dbus-1/system.d/dnsmasq.conf;\
+		ln -sf dnsmasq-base debian/dnsmasq/usr/share/doc/$$pkg
+	pkg=dnsmasq-base ; install -d debian/$$pkg/usr/share/doc/$$pkg\
+		-d debian/$$pkg/usr/share/doc/$$pkg/examples\
+		-d debian/$$pkg/var/run\
+		-d debian/$$pkg/var/lib/misc;\
+		make $(TARGET) PREFIX=/usr DESTDIR=`pwd`/debian/$$pkg CFLAGS=$(CFLAGS) COPTS=$(COPTS) CC=gcc
 ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
-	cp doc.html debian/tmp/usr/share/doc/$(package)/.
-	cp setup.html debian/tmp/usr/share/doc/$(package)/.
-	cp dnsmasq.conf.example debian/tmp/usr/share/doc/$(package)/examples/.
-	cp FAQ debian/tmp/usr/share/doc/$(package)/.
-	gzip -9 debian/tmp/usr/share/doc/$(package)/FAQ
-	cp CHANGELOG debian/tmp/usr/share/doc/$(package)/changelog
-	gzip -9 debian/tmp/usr/share/doc/$(package)/changelog
-	cp dbus/DBus-interface debian/tmp/usr/share/doc/$(package)/.
-	gzip -9 debian/tmp/usr/share/doc/$(package)/DBus-interface	
-endif
-	cp debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
-	gzip -9 debian/tmp/usr/share/doc/$(package)/changelog.Debian
-	cp debian/readme debian/tmp/usr/share/doc/$(package)/README.Debian
-	cp debian/copyright debian/tmp/usr/share/doc/$(package)/copyright
-	gzip -9 debian/tmp/usr/share/man/man8/dnsmasq.8
-	for f in debian/tmp/usr/share/man/*; do \
+	pkg=dnsmasq-base;\
+	cp doc.html		debian/$$pkg/usr/share/doc/$$pkg/.;\
+	cp setup.html		debian/$$pkg/usr/share/doc/$$pkg/.;\
+	cp dnsmasq.conf.example	debian/$$pkg/usr/share/doc/$$pkg/examples/.;\
+	cp FAQ 			debian/$$pkg/usr/share/doc/$$pkg/.;\
+	cp CHANGELOG		debian/$$pkg/usr/share/doc/$$pkg/changelog;\
+	cp dbus/DBus-interface	debian/$$pkg/usr/share/doc/$$pkg/.;\
+	gzip -9 debian/$$pkg/usr/share/doc/$$pkg/FAQ;\
+	gzip -9 debian/$$pkg/usr/share/doc/$$pkg/changelog;\
+	gzip -9 debian/$$pkg/usr/share/doc/$$pkg/DBus-interface	
+endif
+	pkg=dnsmasq-base ;\
+	cp debian/changelog	debian/$$pkg/usr/share/doc/$$pkg/changelog.Debian;\
+	cp debian/readme	debian/$$pkg/usr/share/doc/$$pkg/README.Debian;\
+	cp debian/copyright	debian/$$pkg/usr/share/doc/$$pkg/copyright;\
+	gzip -9 debian/$$pkg/usr/share/doc/$$pkg/changelog.Debian;\
+	gzip -9 debian/$$pkg/usr/share/man/man8/dnsmasq.8;\
+	for f in debian/$$pkg/usr/share/man/*; do \
 		if [ -f $$f/man8/dnsmasq.8 ]; then \
gzip -9 $$f/man8/dnsmasq.8 ; \
 fi \
 	done
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip -R .note -R .comment debian

Bug#463407: dnsmasq: Please provide no-conf variant

2008-01-31 Thread Soren Hansen
Package: dnsmasq
Version: 2.40-1
Severity: normal

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


Hi!

I'd like to be able to add dnsmasq as a dependency of libvirt as it can
use it to provide dns and dhcp to virtual networks it manages. If,
however, I already have e.g. bind9 installed, dnsmasq and bind9 both try
to listen on port 53 and obviously one of them will fail.

Would it be possible to move everything but the init script and defaults
file to a dnsmasq-base (or similar), and have dnsmasq depend on that?
That would change nothing for users who are used to the way dnsmasq
works now (which I belive to be correct for most use cases, by the way),
while making it possible to use dnsmasq in sort of an embedded manner
inside libvirt?



- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-6-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages dnsmasq depends on:
ii  adduser   3.105ubuntu1   add and remove users and groups
ii  libc6 2.7-5ubuntu2   GNU C Library: Shared libraries
ii  libdbus-1-3   1.1.2-1ubuntu2 simple interprocess messaging syst
ii  netbase   4.30ubuntu1Basic TCP/IP networking system

dnsmasq recommends no packages.

- -- no debconf information

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHodJjonjfXui9pOMRAhswAJ9uTmGDkB/vHWisPjkPOYgsDcgz8QCeKykV
8OAxSjJrMitI2r3vCT7ByeY=
=zgBp
-END PGP SIGNATURE-



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



Bug#145798: netcat: openbsd's rewrite of netcat might help some ppl... or not

2008-01-15 Thread Soren Hansen
 I didn't want to replace what we have, but if this bug is really an
 RFP, I'll check it out, see if there's anything to be done to make
 using the alternatives system work, and put a package together. Ping
 me again if this isn't ready by the end of the week.

Consider yourself pinged. :)

I took the liberty of grabbing Fedora's packages as they're based on
OpenBSD's implementation and added a patch to maintain full command line
argument compatibility.

You can find it at:

  http://people.ubuntu.com/~soren/upload/netcat/netcat_1.84-1_source.changes

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#458814: smssend: Implement Charset conversion and add unotel support

2008-01-02 Thread Soren Hansen
 info2you.sms 
ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms 
lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms 
mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms 
mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms 
o2-genie.sms oi.sms onelv.
 sms orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms 
passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms 
room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms 
smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms 
tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms 
timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms 
ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms 
unotel.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms 
yab.sms
 
-EXTRA_DIST = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms 
amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms 
basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms 
bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms 
coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms 
ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms 
exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms 
globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms 
gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms 
ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms 
lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms 
mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms 
mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms 
o2-genie.sms oi.sms onelv.sm
 s orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms 
passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms 
room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms 
smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms 
tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms 
timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms 
ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms vivo.sms 
vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms yab.sms
+EXTRA_DIST = 130sms.sms 1rstwap.sms 6sensreg.sms 6sens.sms a1_globalsms.sms 
amazonia.sms americel.sms armgsm.sms atl.sms attwireless.sms banana.sms 
basemine.sms bcp.sms bell.sms bol_rus.sms bol.sms boltblue.sms bramka.sms 
bwc.sms clarodigital.sms claro.sms clubmessage.sms comcel.sms 
coolsmsdk-fast.sms coolsmsdk.sms cosmos.sms cricket.sms ebol.sms e-merge.sms 
ems-iwarp.sms ermak_rus.sms etsity.sms eurobate.sms eurotel.sms everyday.sms 
exoset.sms extel-gsm.sms fajront.sms fido.sms freenet.sms freesmsau.sms ft.sms 
globtel.sms gmxde.sms goingtonight.sms golden.sms gomobile.sms gorizont-rt.sms 
gtnet.sms halebop.sms hooya.sms hotsms.sms indosat-m3.sms info2you.sms 
ingyensms.sms inwind.sms iol.sms kiyvstar.sms kyivstar.sms lycosde.sms 
lycosse.sms lycos.sms lycosuk.sms mageos.sms maxitel.sms megaforums.sms 
mobimel.sms mobitag.sms mobitel.sms mtnsms.sms mtsmb.sms mts.sms mtsspb.sms 
mufa.sms mybegin.sms natelskyline.sms netcom.sms netzquadrat.sms nwgsm.sms 
o2-genie.sms oi.sms onelv.sm
 s orangeportal.sms orange.sms orf.sms oskar.sms paegas.sms pager.sms 
passagen.sms planet.sms plus.sms proximus.sms quick.sms rekom.sms rogers.sms 
room33.sms scs-900.sms sfr.sms simobil.sms smarts.sms sms_ac.sms smsitaly.sms 
smspress.sms smsro.sms sprintpcs.sms starhub.sms suomi24.sms surfeu.sms 
tango.sms tankssms.sms telebahiacelular.sms telemig.sms telering.sms tess.sms 
timnordeste.sms timsul.sms t-mobile.sms totalise.sms touristik.sms 
ubootflash.sms uboot.sms umail.sms umc.sms unimobile.sms universal.sms 
unotel.sms vivo.sms vizzavifr.sms vizzavigr.sms vizzaviuk.sms vodacom.sms 
yab.sms
 subdir = scripts
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
only in patch2:
unchanged:
--- smssend-3.4.orig/scripts/unotel.sms
+++ smssend-3.4/scripts/unotel.sms
@@ -0,0 +1,31 @@
+# Unotel (Denmark) - www.unotel.dk
+# Version 0.9
+# by Soren Hansen [EMAIL PROTECTED]
+#
+# Error codes:
+# 1: Login failed
+#
+# Usage:
+#   smssend unotel PHONENO PASSWORD RECIPIENT MESSAGE
+#
+
+NbParams 4
+%Phone : Your phone number (omit +45)
+%Password Hidden : Your password (for www.unotel.dk)
+%Dest Size=8 : Recipient (8 digits)
+%Message Size=1200 Convert Charset-latin1 : Your message
+
+# Log in
+PostURL https://www.unotel.dk/nykundelogin/login.asp
+PostData brugernavn=\%Phone%adgangskode=\%Password%submit1=%A0%A0login%A0%A0
+Search Vi kunne ikke finde nogen kunde
+ErrorMsg 1 Login failed.
+GO

Bug#458402: skyutils: Doesn't handle pathless redirects

2007-12-30 Thread Soren Hansen
Package: skyutils
Version: 2.7-1
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1



In Ubuntu, we've applied the attached patch to achieve the following:

  * Properly handle redirects if only a query part is given in the Location
header.

We thought you might be interested in doing the same. 


- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-2-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHeC/6onjfXui9pOMRAnspAKCepnK0nNO9UaPdIBNpaPTo/9FYowCgrRE8
+5V/6dxz9yrJKkWmr0nlatU=
=0O3C
-END PGP SIGNATURE-
--- skyutils-2.7.orig/src/web.c
+++ skyutils-2.7/src/web.c
@@ -2283,11 +2283,22 @@
 
   if(strcmp(ptr+strlen(http://;)+(ssl_mode?1:0),Host) == 0) /* If requested the root of the site */
 SU_strcat(ptr,/,len);
-  else
+  else if (*Location == '?')
   {
 i = strlen(ptr) - 1;
 while(i=0)
 {
+  if(ptr[i] == '?')
+  {
+ptr[i+1] = 0;
+break;
+  }
+  i--;
+}
+  } else {
+i = strlen(ptr) - 1;
+while(i=0)
+{
   if(ptr[i] == '/')
   {
 ptr[i+1] = 0;


Bug#456188: nagios-images: Please include Ubuntu icon

2007-12-13 Thread Soren Hansen
Package: nagios-images
Severity: normal

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


Hi!

It would be lovely if you could include an Ubuntu logo in the
nagios-images package. Just to be sure, I checked with
[EMAIL PROTECTED], and (not surprisingly) this is completely
alright.

- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHYUMgonjfXui9pOMRAnElAJ4tVQcu9Zyw16MlvDxe9BWP4112vACffeAz
H3YdAr/FXdtYauY/zuP6cM0=
=WQ6P
-END PGP SIGNATURE-



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



Bug#452937: bochs: Add qemu specific bios package

2007-11-26 Thread Soren Hansen
Package: bochs
Version: 2.3+20070705-2
Severity: normal

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1



In Ubuntu, we've applied the attached patch to add a qemu specific bios
package to the bochsbios build. QEMU upstream distributes the bios blob
in their tarball along with a tiny patch. I've taken that patch and
added it to bochs and build an extra package for this so that qemu can
use that instead.

We thought you might be interested in doing the same. 


- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHSoJxonjfXui9pOMRAjFbAJsFs19Qo6cQwEDxBfmwXsb8rmtqagCeMZ3d
xySC7lvZoghjhHVTT6li800=
=dNii
-END PGP SIGNATURE-
diff -u bochs-2.3+20070705/debian/patches/series 
bochs-2.3+20070705/debian/patches/series
--- bochs-2.3+20070705/debian/patches/series
+++ bochs-2.3+20070705/debian/patches/series
@@ -6,0 +7 @@
+06_qemu_bios.patch
diff -u bochs-2.3+20070705/debian/changelog bochs-2.3+20070705/debian/changelog
diff -u bochs-2.3+20070705/debian/control bochs-2.3+20070705/debian/control
--- bochs-2.3+20070705/debian/control
+++ bochs-2.3+20070705/debian/control
@@ -48,6 +49,17 @@
  .
  This package contains the BIOS of the Bochs project.
 
+Package: bochsbios-qemu
+Architecture: all
+XB-Tag: hardware::emulation, implemented-in::c++, role::data
+Description: Bochs BIOS for qemu
+ Bochs is a highly portable free IA-32 (x86) PC emulator written in C++, that
+ runs on most popular platforms. It includes emulation of the Intel x86 CPU,
+ common I/O devices, and a custom BIOS.
+ .
+ This package contains a special version of the BIOS of the Bochs project built
+ for qemu.
+
 Package: bochs-wx
 Architecture: any
 Depends: ${shlibs:Depends}, bochs (= ${binary:Version})
only in patch2:
unchanged:
--- bochs-2.3+20070705.orig/debian/patches/06_qemu_bios.patch
+++ bochs-2.3+20070705/debian/patches/06_qemu_bios.patch
@@ -0,0 +1,66 @@
+Index: bochs-2.3+20070705/bios/Makefile.in
+===
+--- bochs-2.3+20070705.orig/bios/Makefile.in   2006-10-03 22:27:30.0 
+0200
 bochs-2.3+20070705/bios/Makefile.in2007-11-23 17:07:49.401603746 
+0100
+@@ -57,7 +57,7 @@
+   $(CXX) -c $(BX_INCDIRS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @[EMAIL 
PROTECTED] @[EMAIL PROTECTED]@
+ 
+ 
+-bios: biossums BIOS-bochs-latest BIOS-bochs-legacy 
++bios: biossums BIOS-bochs-latest-qemu BIOS-bochs-latest BIOS-bochs-legacy 
+ 
+ clean:
+   @RMCOMMAND@ *.o *.a *.s _rombios*_.c rombios*.txt rombios*.sym
+@@ -92,15 +92,25 @@
+   @RMCOMMAND@ _rombios_.s
+ 
+ 
++rombios32-qemu.bin: rombios32-qemu.out rombios.h
++  objcopy -O binary $ $@
++  ./biossums -pad $@
++
+ rombios32.bin: rombios32.out rombios.h
+   objcopy -O binary $ $@
+   ./biossums -pad $@
+ 
++rombios32-qemu.out: rombios32start.o rombios32-qemu.o rombios32.ld
++  ld -o $@ -T rombios32.ld rombios32start.o rombios32-qemu.o
++
+ rombios32.out: rombios32start.o rombios32.o rombios32.ld
+   ld -o $@ -T rombios32.ld rombios32start.o rombios32.o
+ 
++rombios32-qemu.o: rombios32.c acpi-dsdt.hex
++  $(GCC) -fno-stack-protector -DBX_QEMU -O2 -Wall -c -o $@ $
++
+ rombios32.o: rombios32.c acpi-dsdt.hex
+-  $(GCC) -O2 -Wall -c -o $@ $
++  $(GCC) -fno-stack-protector -O2 -Wall -c -o $@ $
+ 
+ ifeq (1, 0)
+ acpi-dsdt.hex: acpi-dsdt.dsl
+@@ -110,6 +120,9 @@
+ rombios32start.o: rombios32start.S
+   $(GCC) -c -o $@ $
+ 
++BIOS-bochs-latest-qemu: rombios16.bin rombios32-qemu.bin
++  cat rombios32-qemu.bin rombios16.bin  $@
++
+ BIOS-bochs-latest: rombios16.bin rombios32.bin
+   cat rombios32.bin rombios16.bin  $@
+ 
+Index: bochs-2.3+20070705/bios/rombios32.c
+===
+--- bochs-2.3+20070705.orig/bios/rombios32.c   2007-06-17 09:37:11.0 
+0200
 bochs-2.3+20070705/bios/rombios32.c2007-11-23 17:06:39.044824617 
+0100
+@@ -861,6 +861,11 @@
+ int ioapic_id, i, len;
+ int mp_config_table_size;
+ 
++#ifdef BX_QEMU
++if (smp_cpus = 1)
++return;
++#endif
++
+ #ifdef BX_USE_EBDA_TABLES
+ mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - 
MPTABLE_MAX_SIZE);
+ #else
only in patch2:
unchanged:
--- bochs-2.3+20070705.orig/debian/bochsbios-qemu.dirs
+++ bochs-2.3+20070705/debian/bochsbios-qemu.dirs
@@ -0,0 +1 @@
+usr/share/bochs
only in patch2:
unchanged:
--- bochs-2.3+20070705.orig/debian/bochsbios-qemu.install
+++ bochs-2.3+20070705/debian/bochsbios-qemu.install
@@ -0,0 +1 @@
+usr/share/bochs/BIOS-bochs-latest-qemu


Bug#452963: kvm: Don't include blobs

2007-11-26 Thread Soren Hansen
Package: kvm
Version: 53-1
Severity: serious
Justification: Policy 2.1

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1


The orig.tar.gz you ship contains around 1 MB of various blobs. This
violates the LGPL under which most of them are released (you're shipping
binaries without accompanying source code) and it's also in violation of
the dfsg.

I've revived your old get-orig-source target from debian/rules and
extended it to remove the additional violating files, and also adding a
work around to make qemu's build system happy (patch attached, mostly
taken from qemu) and adding the proper dependencies to the kvm binary
package (bochsbios-qemu (new package, patch sent to Debian's bochs
maintainer), and vgabios) and putting symlinks in place, just like qemu
does it.

- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHSqw6onjfXui9pOMRAkJVAJ4nyZt02MOK0e+JBfC2R+XF161b1ACgm7RQ
q9TVJguQSSkkTDPQgt/hsCc=
=2UhR
-END PGP SIGNATURE-
diff -urNw ../debian/kvm-53/debian/links debian/links
--- ../debian/kvm-53/debian/links   1970-01-01 01:00:00.0 +0100
+++ debian/links2007-11-26 10:30:24.992510362 +0100
@@ -0,0 +1,3 @@
+usr/share/bochs/BIOS-bochs-latest-qemu usr/share/kvm/bios.bin
+usr/share/vgabios/vgabios.bin usr/share/kvm/vgabios.bin
+usr/share/vgabios/vgabios.cirrus.bin usr/share/kvm/vgabios-cirrus.bin
diff -urNw ../debian/kvm-53/debian/rules debian/rules
--- ../debian/kvm-53/debian/rules   2007-11-26 11:55:22.0 +0100
+++ debian/rules2007-11-26 11:48:23.255340144 +0100
@@ -91,7 +91,7 @@
 
# Add here command to compile/build the package.
$(MAKE) qemu
-   $(MAKE) -C qemu/pc-bios
+#  $(MAKE) -C qemu/pc-bios
touch $@
 
 # the binary-modules rule is invoked by module-assistant while processing the
@@ -142,7 +142,7 @@
rm -f config.sub config.guess
 
# Add here commands to clean up after the build process.
-   -$(MAKE) -C qemu/pc-bios clean
+#  -$(MAKE) -C qemu/pc-bios clean
-$(MAKE) -C qemu distclean
-$(MAKE) clean
 
@@ -155,7 +155,7 @@
 ifeq (1, 1)
 
 # Removing non-x86 bioses + linux_boot.bin which currently escapes to the metal
-unwanted_bios_files = ppc_rom.bin proll.elf openbios-sparc32 video.x 
linux_boot.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin
+unwanted_bios_files = ppc_rom.bin openbios-sparc32 video.x pxe-ne2k_pci.bin 
pxe-pcnet.bin pxe-rtl8139.bin bios.bin vgabios.bin vgabios-cirrus.bin 
 
 else
 
@@ -173,10 +173,19 @@
# Create the directories to install the source into
dh_installdirs -p$(psource)  usr/src/modules/$(sname)/debian
 
+   # Make qemu's make install happy
+   for i in $(unwanted_bios_files); do \
+   touch qemu/pc-bios/$$i; \
+   done
# Build  install normally, remove extraneous files
$(MAKE) -C libkvm DESTDIR=$(CURDIR)/debian/$(sname) install
$(MAKE) -C qemu DESTDIR=$(CURDIR)/debian/$(sname) install
 
+   # Clean up the mess
+   for i in $(unwanted_bios_files); do \
+   rm -f qemu/pc-bios/$$i debian/tmp/usr/share/kvm/$$i; \
+   done
+
# Add here commands to install the package into debian/kvm.
dh_install
mv $(CURDIR)/debian/kvm/usr/bin/$(QEMU_EXE) 
$(CURDIR)/debian/kvm/usr/bin/kvm
@@ -284,4 +294,47 @@
 
 binary: binary-indep binary-arch
 
+# get-orig-source adapted from 
/usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk from the gnome-pkg-tools 
package
+# copied from CDBS' buildvars
+DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut 
-f 2 -d ':'))
+DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' 
')
+DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 
's/+[^-]*-[^-]*$$//')
+
+# where to store the resulting .orig tarball
+DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs
+TARBALL_EXT ?= tar.gz
+
+SF_PROJECT ?= $(DEB_SOURCE_PACKAGE)
+SF_MODULE ?= $(DEB_SOURCE_PACKAGE)
+SF_TARBALL ?= $(SF_MODULE)-$(DEB_UPSTREAM_VERSION).$(TARBALL_EXT)
+SF_DOWNLOAD_URL ?= 
http://$$sf_mirror.dl.sourceforge.net/$(SF_PROJECT)/$(SF_TARBALL)
+SF_MIRRORS ?= belnet easynews heanet internap jaist kent mesh nchc optusnet 
ovh puzzle superb-east superb-west surfnet switch ufpr umn
+SF_DOWNLOAD_COMMAND ?= for sf_mirror in $(SF_MIRRORS); do wget -N -nv -T10 -t1 
-O 
$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT)
 $(SF_DOWNLOAD_URL)  break; done
+
+get-orig-source:
+   dh_testdir
+   @@echo 'Source package:  $(DEB_SOURCE_PACKAGE)'
+   @@echo 'Source package:  

Bug#451355: ITP: libgfshare -- library and utilities for multi-way secret sharing

2007-11-16 Thread Soren Hansen
On Fri, Nov 16, 2007 at 10:31:06AM +, Simon McVittie wrote:
  I already packaged this in Ubuntu. Feel free to adopt it for Debian.
 Having looked at the Ubuntu packaging, I'm somewhat concerned about it
 - it seems you don't have the changes I made in upstream bzr to make
 gfsplit cryptographically safe.

No, I wasn't aware of such changes.

 The patch to gfcombine to support - as meaning standard output looks
 reasonable, but I'm not sure what it's doing in Ubuntu but not
 upstream... perhaps we could get that in 1.0.3. The patch is:

The patch should definitely have been sent upstream. My apologies. I
wrote it while on a train, and when I got near internet access again, I
had forgotten all about it. I suck.

 although I'd be inclined to change it to just use stdout instead of
 fdopening STDOUT_FILENO, 

Makes sense. I can't remember why I did it that way, tbh.

 and make the indentation consistent (the rest of the package
 consistently uses 2 spaces, the else clause in the patch has a tab).

Good catch.

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#451355: ITP: libgfshare -- library and utilities for multi-way secret sharing

2007-11-15 Thread Soren Hansen
On Thu, Nov 15, 2007 at 10:02:46AM +, Simon McVittie wrote:
 If anyone's interested: I have vague plans to write a FUSE filesystem
 that works like a cross between gfcombine and unionfs, and the
 upstream author has told me that Søren Hansen http://warma.dk/blog/
 has similar plans.

Right. I'd say I'm 70% done. I want to integrate it with hal, which
turned out to be a bit tricky, but I know where I'm headed. The code is
a mess right now, but I'll put it in a bzr branch somewhere when I get
it cleaned up a bit.

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#451355: ITP: libgfshare -- library and utilities for multi-way secret sharing

2007-11-15 Thread Soren Hansen
I already packaged this in Ubuntu. Feel free to adopt it for Debian.

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#448757: pbuilder: pdebuild - Breakage when using XC- headers

2007-10-31 Thread Soren Hansen
Package: pbuilder
Version: 0.174
Severity: normal

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1



In Ubuntu, we've applied the attached patch to achieve the following:

  * Fix sed for pdebuild-internal to stop matching Original-Maintainer
field as an output file name.

More generally, as any custom .changes fields in the control file
(XC-blah) lands at the bottom of the .changes file, the sed magic in
pdebuild-internal accidentally matches those fields as files to be
copied. We work around this by requiring a space at the beginning of the
line for us to consider it a file to be copied.

We thought you might be interested in doing the same. 

- -- System Information:
Debian Release: lenny/sid
  APT prefers hardy
  APT policy: (500, 'hardy'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-14-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHKKCBonjfXui9pOMRAohFAJ9su4GHymMeXe6Zn3URKHOkAuV/OQCfQ2rq
mloXWTvSjx7ZrVYCIRztRXI=
=xUDj
-END PGP SIGNATURE-
diff -Nru /tmp/7jiUmuJJVn/pbuilder-0.174ubuntu1/debian/changelog 
/tmp/Vrb48UhHTS/pbuilder-0.174ubuntu2/debian/changelog
diff -Nru /tmp/7jiUmuJJVn/pbuilder-0.174ubuntu1/pdebuild 
/tmp/Vrb48UhHTS/pbuilder-0.174ubuntu2/pdebuild
--- /tmp/7jiUmuJJVn/pbuilder-0.174ubuntu1/pdebuild  2007-05-27 
06:02:57.0 +0200
+++ /tmp/Vrb48UhHTS/pbuilder-0.174ubuntu2/pdebuild  2007-10-31 
16:13:03.0 +0100
@@ -47,7 +47,7 @@
 if [ ${USE_PDEBUILD_INTERNAL} = 'yes' ]; then
 ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute $@ [EMAIL 
PROTECTED]/#/--configfile } --bindmounts $(readlink -f ..) -- 
/usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts ${DEBBUILDOPTS} 
--uid ${BUILDRESULTUID} --gid ${BUILDRESULTGID} --pbuildersatisfydepends 
$PBUILDERSATISFYDEPENDSCMD
 if [ -d ${BUILDRESULT} ]; then
-   for files in $(sed -rn '/^Files:/,${s/.* ([^ ]+)$/\1/p}' 
../${CHANGES}); do
+   for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}' 
../${CHANGES}); do
cp -a ../$files ${BUILDRESULT}
done
cp -a ../${CHANGES} ${BUILDRESULT}


Bug#440624: php5: Fix broken memory_limit in php.ini

2007-09-03 Thread Soren Hansen
Package: php5
Version: 5.2.3-1
Severity: normal

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1



*** ../bug-body.txt
In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/rules:
- Fix broken memory_limit mangling for php5-cli. (LP: #109079)
  * debian/php5-cli.postinst, debian/rules:
- Use same php.ini-dist for all flavours. The only difference used to be
  cli having a higher memory_limit value, but upstream has changed this to
  128MB, which is higher than both of the previous values.

We thought you might be interested in doing the same. 


- -- System Information:
Debian Release: lenny/sid
  APT prefers gutsy
  APT policy: (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-10-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFG28IlonjfXui9pOMRAkQKAJwNq+pfKsLTZAzkLvIHfVYIlHWVXgCfWy8A
Jv8XxCI9ITdtTGe19/lhpNM=
=QqwO
-END PGP SIGNATURE-
diff -u php5-5.2.3/debian/php5-cli.postinst php5-5.2.3/debian/php5-cli.postinst
--- php5-5.2.3/debian/php5-cli.postinst
+++ php5-5.2.3/debian/php5-cli.postinst
@@ -22,13 +22,13 @@
oldmd5=`md5sum $phpini | cut -d' ' -f1`
if [ $oldmd5 = c85605baab79fbcd3c289e442eb3caa2 ]; then
# then silently update it before registering via ucf
-   cp /usr/share/php5/php.ini-dist.cli $phpini
+   cp /usr/share/php5/php.ini-dist $phpini
fi
fi
 fi
 # END LEGACY SUPPORT
 
-ucf /usr/share/php5/php.ini-dist.cli $phpini
+ucf /usr/share/php5/php.ini-dist $phpini
 
 update-alternatives \
--install /usr/bin/php php /usr/bin/php5 50 \
diff -u php5-5.2.3/debian/rules php5-5.2.3/debian/rules
--- php5-5.2.3/debian/rules
+++ php5-5.2.3/debian/rules
@@ -326,7 +325,6 @@
 
# sanitize php.ini file
cat php.ini-dist | tr \t
debian/php5-common/usr/share/php5/php.ini-dist
-   cat php.ini-dist | tr \t   | sed -e'/memory_limit =/ s/8M/32M/g'  
debian/php5-common/usr/share/php5/php.ini-dist.cli
cat php.ini-dist | tr \t
debian/php5-common/usr/share/doc/php5-common/examples/php.ini-dist
cat php.ini-recommended | tr \t
debian/php5-common/usr/share/doc/php5-common/examples/php.ini-recommended
cat php.ini-paranoid | tr \t
debian/php5-common/usr/share/doc/php5-common/examples/php.ini-paranoid


Bug#440624: [php-maint] Bug#440624: php5: Fix broken memory_limit in php.ini

2007-09-03 Thread Soren Hansen
On Mon, Sep 03, 2007 at 06:56:17PM +0200, sean finney wrote:
* debian/rules: - Fix broken memory_limit mangling for php5-cli.
(LP: #109079)
 what was broken about it?

A limit of 1232 MB seems a bit excessive, if you ask me. :) (It's what
happens when you apply s/8MB/32MB/g to 128MB)

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#440624: [php-maint] Bug#440624: Bug#440624: php5: Fix broken memory_limit in php.ini

2007-09-03 Thread Soren Hansen
On Mon, Sep 03, 2007 at 12:53:38PM -0700, Steve Langasek wrote:
   * debian/php5-cli.postinst, debian/rules: - Use same php.ini-dist
   for all flavours. The only difference used to be cli having a
   higher memory_limit value, but upstream has changed this to 128MB,
   which is higher than both of the previous values.
 Well, I'm disturbed that upstream thinks 128MB is a reasonable default
 memory limit for a single PHP script and think it ought to be
 *lowered* in each of the packages.

That was my initial sentiment as well. I've now done a bit of digging,
and it seems upstream chose this default since the previous default was
that memory-limit was disabled unless explicitly enabled at build time,
and they didn't want to cause breakage by enabling it. Since we've
always had the limit enabled, I belive we should stick to our 32 MB
limit and not 128 MB as upstream suggests.

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#435077: Add dependency on libterm-readline-perl-perl

2007-07-29 Thread Soren Hansen
Package: lighttpd
Version: 1.4.16-1

Forwarded from Ubuntu's bug tracking system: 
lighty-enable-mod script fails because it can't find ReadLine.pm, which
is in package libterm-readline-perl-perl.

libterm-readline-perl-perl should be dependency of lighttpd

[EMAIL PROTECTED]:~$ sudo lighty-enable-mod Can't locate Term/ReadLine.pm in
@INC (@INC contains: /etc/perl /usr/local/lib/perl/5.8.7
/usr/local/share/perl/5.8.7 /usr/lib/perl5 /usr/share/perl5
/usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at
/usr/sbin/lighty-enable-mod line 16.  BEGIN failed--compilation aborted
at /usr/sbin/lighty-enable-mod line 16.

In Ubuntu, we fixed this by replacing lighty's dependency on perl to
libterm-readline-perl-perl.

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#413873: SGML shorthand are not meant for nesting

2007-07-28 Thread Soren Hansen
I just stumbled upon this, too.

 taglist
 tag/tt/if var/condition///
 tag/tt/elif var/condition///
 tag/tt/else//
 tag/tt/fi//
 item
[...]
 But is multiple tag without item allowed?

Well, at bit later in the same file, you see:

tag/tt/errors-push/ var/filename//
tag/tt/srorre//
item
Stacks the error handling behaviour currently in effect. [...]

..and that seems to work just fine. I also found out that removing the
taglist with all the possible conditions makes the missing tags reappear
as well.
I've never examined the debiandoc code (or even ever used debiandoc)
before, but I tried instrumenting the XML output format generator to see
where the output went, and I could follow it almost all the way through
until I came to the output subroutine which I didn't manage to find
until I got fed up. :) Anyhow, my point is that I wouldn't rule out the
possibility that it's debiandoc (or something in the debiandoc compile
toolchain) that's discarding it for some reason, rather than Ian's
markup being wrong.

-- 
Soren Hansen
Ubuntu Server Team
http://www.ubuntu.com/


signature.asc
Description: Digital signature


Bug#402779: Typo in GrandrApplet.server

2006-12-12 Thread Soren Hansen
Package: gnome-randr-applet
Version: 0.2-2

As reported in Ubuntu (launchpad.net/bugs/62124) by Diego Ongaro on
2006-09-24: 

When in the Add to Panel... dialog, the applet shows up as the lone item
in the category Utility, instead of following the convention of
Utilities.

Here's a patch that'll fix the issue. It most likely affects upstream
too.

-- 
| Soren Hansen| Linux2Go  | http://Linux2Go.dk/ |
| Seniorkonsulent | Lindholmsvej 42, 2. TH| +45 46 90 26 42 |
| [EMAIL PROTECTED]  | 9400 Norresundby, Denmark | GPG key: E8BDA4E3   |
--- /usr/lib/bonobo/servers/GrandrApplet.server.dist2006-09-24 
00:46:12.0 -0500
+++ /usr/lib/bonobo/servers/GrandrApplet.server 2006-09-24 00:46:23.0 
-0500
@@ -23,7 +23,7 @@
 
 oaf_attribute name=name type=string value=Display Geometry 
Switcher/
 oaf_attribute name=description type=string value=Quickly change 
display resolution and orientation./
-oaf_attribute name=panel:category type=string value=Utility/
+oaf_attribute name=panel:category type=string value=Utilities/
 oaf_attribute name=panel:icon type=string value=grandr.png/
 
 /oaf_server


signature.asc
Description: Digital signature


Bug#401238: Bashism in debian/rules

2006-12-01 Thread Soren Hansen
Package: axiom
Version: 20050901-9

debian/rules contains a bashism in the debian/axiom-graphics.install and
debian/axiom-hypertex.install targets.

Also, I find the 'while sleep 1800 ; do echo tick; done' loop in
debian/rules superfluous, but that's just me. :-)

Please apply the attached fix for the bashism.

-- 
| Soren Hansen| Linux2Go  | http://Linux2Go.dk/ |
| Seniorkonsulent | Lindholmsvej 42, 2. TH| +45 46 90 26 42 |
| [EMAIL PROTECTED]  | 9400 Norresundby, Denmark | GPG key: E8BDA4E3   |
diff -u axiom-20050901/debian/rules axiom-20050901/debian/rules
--- axiom-20050901/debian/rules
+++ axiom-20050901/debian/rules
@@ -136,14 +134,14 @@
echo debian/axiom.1 usr/share/man/man1 $@
 
 debian/axiom-graphics.install: 
-   find mnt/linux/{bin,lib}/view* | awk 
'{a=$$1;sub(/[^/]*$$,,a);sub(mnt/linux/,,a);printf(%s 
usr/lib/$(PD)/%s\n,$$1,a);}' $@
+   find mnt/linux/bin/view* mnt/linux/lib/view* | awk 
'{a=$$1;sub(/[^/]*$$,,a);sub(mnt/linux/,,a);printf(%s 
usr/lib/$(PD)/%s\n,$$1,a);}' $@
 
 debian/axiom-graphics-data.install: 
echo mnt/linux/lib/graph | awk 
'{a=$$1;sub(/[^/]*$$,,a);sub(mnt/linux/,,a);printf(%s 
usr/lib/$(PD)/%s\n,$$1,a);}' $@
echo mnt/linux/doc/viewports | awk '{printf(%s 
usr/share/doc/axiom-doc\n,$$1);}' $@
 
 debian/axiom-hypertex.install: 
-   find mnt/linux/{bin,lib}/h[ty]* | awk 
'{a=$$1;sub(/[^/]*$$,,a);sub(mnt/linux/,,a);printf(%s 
usr/lib/$(PD)/%s\n,$$1,a);}' $@
+   find mnt/linux/bin/h[ty]* mnt/linux/lib/h[ty]* | awk 
'{a=$$1;sub(/[^/]*$$,,a);sub(mnt/linux/,,a);printf(%s 
usr/lib/$(PD)/%s\n,$$1,a);}' $@
 
 debian/axiom-hypertex-data.install: 
echo mnt/linux/doc/hypertex | awk '{printf(%s 
usr/share/doc/axiom-doc\n,$$1);}' $@


signature.asc
Description: Digital signature


Bug#378143: broken(?) snapshot prevents vgchange -a y, prevents boot

2006-09-01 Thread Soren Hansen
Something similar just happened to me on my ubuntu server. It turns out
that (in my case at least) that the support missing from kernel bit
indeed *IS* accurate. After loading dm-mirror and dm-snapshot I could
suddenly activate the LV. I did not try only loading dm-snapshot, but I
expect that would have done the trick.

On an unrelated (and completely off-topic) note, this is the error
message Ubuntu gave me:

[EMAIL PROTECTED]:/etc/lvm# lvchange -ay /dev/vega/var
device-mapper: reload ioctl failed: Invalid argument

It was actually your bug report (the one about the funny error
messages, that gave me the hint to solve it. :-)


Cheers.


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



Bug#308325: swi-prolog: New upstream version

2005-05-09 Thread Soren Hansen
Package: swi-prolog
Version: 5.2.13-1
Severity: important

I know there's already a bug report about a new upstream version being
available, but I really believe this is a serious issue, and I don't
know how to change the severity of an existing bug..

The version currently available in both Sarge and Sid is more than a
year old, and there has been several releases (both stable and
developmental) since then. 


-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.8-2-686
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)

Versions of packages swi-prolog depends on:
ii  libc6   2.3.2.ds1-21 GNU C Library: Shared libraries an
ii  libncurses5 5.4-4Shared libraries for terminal hand
ii  libreadline44.3-11   GNU readline and history libraries

-- no debconf information


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