Merge lp:~lfaraone/ubuntu/lucid/lshell/lp540934 into lp:ubuntu/lucid/lshell

[Luke Faraone]

[Benjamin Drung (bdrung)]

* You have to update the Maintainer field with update-maintainer.
* Please create a patch instead of patching the source directly.

review: Needs Fixing

[lp:~lfaraone/ubuntu/lucid/lshell/lp540934]

6. By Luke Faraone on 2010-04-03

Move security fix out into a separate patch.

7. By Luke Faraone on 2010-04-03

Update Maintainer field.

[Luke Faraone (lfaraone)]

> * You have to update the Maintainer field with update-maintainer.
> * Please create a patch instead of patching the source directly.

I have fixed the above concerns in the last two commits.

review: Needs Resubmitting

[Benjamin Drung (bdrung)]

It would be nice if you could add a DEP-3 header [1] to the patch.

[1] http://dep.debian.net/deps/dep3/

[James Westby (james-w)]

Added DEP-3 headers and uploaded.

Thanks,

James

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-01 19:07:01 +0000
+++ debian/changelog	2010-04-03 20:33:23 +0000
@@ -1,3 +1,11 @@
+lshell (0.9.8-1ubuntu1) lucid; urgency=low
+
+  * Add additional patterns to the forbidden characters list, per Debian bug
+    572144. (LP: #540934) 
+  * Update Maintainer field. 
+
+ -- Luke Faraone <[e-mail]>  Sat, 03 Apr 2010 16:30:16 -0400
+
 lshell (0.9.8-1) unstable; urgency=low
 
   * New upstream version: 

=== modified file 'debian/control'
--- debian/control	2009-12-01 19:07:01 +0000
+++ debian/control	2010-04-03 20:33:23 +0000
@@ -1,7 +1,8 @@
 Source: lshell
 Section: shells
 Priority: optional
-Maintainer: Ignace Mouzannar <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ignace Mouzannar <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~), python-support, python
 Standards-Version: 3.8.3
 

=== added directory 'debian/patches'
=== added file 'debian/patches/forbidden-chars.patch'
--- debian/patches/forbidden-chars.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/forbidden-chars.patch	2010-04-03 20:33:23 +0000
@@ -0,0 +1,11 @@
+--- a/etc/lshell.conf
++++ b/etc/lshell.conf
+@@ -16,7 +16,7 @@
+ allowed         : ['ls','echo','cd','ll']
+ 
+ ##  a list of forbidden character or commands
+-forbidden       : [';', '&', '|','`','>','<']
++forbidden       : [';', '&', '|','`','>','<', '$(', '${']
+ 
+ ##  number of warnings when user enters a forbidden value before getting 
+ ##  exited from lshell

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2010-04-03 20:33:23 +0000
@@ -0,0 +1,1 @@
+forbidden-chars.patch