This is a multi-part MIME message sent by reportbug.
--===============3400407790400870048== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: augeas Version: 0.10.0-1fakesync1 Followup-For: Bug #688347 User: [email protected] Usertags: origin-ubuntu quantal ubuntu-patch Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * augeas-split-lines.patch: consolidate 2 commits from upstream to fix handling of split lines in modprobe.conf (LP: #1054306) (Closes: #688347) 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-31-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash --===============3400407790400870048== Content-Type: text/x-diff; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="augeas_0.10.0-1fakesync1ubuntu1.debdiff" diff -Nru augeas-0.10.0/debian/changelog augeas-0.10.0/debian/changelog diff -Nru augeas-0.10.0/debian/patches/augeas-split-lines.patch augeas-0.10.0/debian/patches/augeas-split-lines.patch --- augeas-0.10.0/debian/patches/augeas-split-lines.patch 1969-12-31 18:00:00.000000000 -0600 +++ augeas-0.10.0/debian/patches/augeas-split-lines.patch 2012-09-24 22:55:49.000000000 -0500 @@ -0,0 +1,60 @@ +Description: Fix modprobe lense to handle lines split by \ + . + This is cherrypicked from upstream, commits c0ff479c and e599fed9. +Author: Dominic Cleal <[email protected]> +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/netcf/+bug/1054306 + +Index: augeas-0.10.0/lenses/modprobe.aug +=================================================================== +--- augeas-0.10.0.orig/lenses/modprobe.aug 2012-09-24 22:53:09.000000000 -0500 ++++ augeas-0.10.0/lenses/modprobe.aug 2012-09-24 22:53:54.661577143 -0500 +@@ -42,7 +42,7 @@ + let sto_no_colons = store /[^:# \t\n\\\\]+/ + + (* View: sto_to_eol *) +-let sto_to_eol = store /[^# \t\n\\\\][^#\n\\\\]*[^# \t\n\\\\]|[^# \t\n\\\\]/ ++let sto_to_eol = store /(([^# \t\n\\\\][^#\n\\\\]*[ \t]*\\\\[ \t]*\n[ \t]*)*([^# \t\n\\\\][^#\n\\\\]*[^# \t\n\\\\]|[^# \t\n\\\\])|[^# \t\n\\\\])/ + + (* View: alias *) + let alias = +Index: augeas-0.10.0/lenses/modules.aug +=================================================================== +--- augeas-0.10.0.orig/lenses/modules.aug 2011-11-28 17:51:05.000000000 -0600 ++++ augeas-0.10.0/lenses/modules.aug 2012-09-24 22:53:54.661577143 -0500 +@@ -20,8 +20,11 @@ + (* View: word *) + let word = /[^#, \n\t\/]+/ + ++(* View: sto_line *) ++let sto_line = store /[^# \t\n].*[^ \t\n]|[^# \t\n]/ ++ + (* View: record *) +-let record = [ key word . (Util.del_ws_tab . Modprobe.sto_to_eol)? . Util.eol ] ++let record = [ key word . (Util.del_ws_tab . sto_line)? . Util.eol ] + + (* View: lns *) + let lns = ( Util.empty | Util.comment | record ) * +Index: augeas-0.10.0/lenses/tests/test_modprobe.aug +=================================================================== +--- augeas-0.10.0.orig/lenses/tests/test_modprobe.aug 2012-09-24 22:53:09.000000000 -0500 ++++ augeas-0.10.0/lenses/tests/test_modprobe.aug 2012-09-24 22:53:47.921549271 -0500 +@@ -124,3 +124,19 @@ + { "attr1" = "\"val\"" } + { "attr2" = "\"val2 val3\"" } + } ++ ++(* Support multiline split commands, Ubuntu bug #1054306 *) ++test Modprobe.lns get "# /etc/modprobe.d/iwlwifi.conf ++# iwlwifi will dyamically load either iwldvm or iwlmvm depending on the ++# microcode file installed on the system. When removing iwlwifi, first ++# remove the iwl?vm module and then iwlwifi. ++remove iwlwifi \ ++(/sbin/lsmod | grep -o -e ^iwlmvm -e ^iwldvm -e ^iwlwifi | xargs /sbin/rmmod) \ ++&& /sbin/modprobe -r mac80211\n" = ++ { "#comment" = "/etc/modprobe.d/iwlwifi.conf" } ++ { "#comment" = "iwlwifi will dyamically load either iwldvm or iwlmvm depending on the" } ++ { "#comment" = "microcode file installed on the system. When removing iwlwifi, first" } ++ { "#comment" = "remove the iwl?vm module and then iwlwifi." } ++ { "remove" = "iwlwifi" ++ { "command" = "(/sbin/lsmod | grep -o -e ^iwlmvm -e ^iwldvm -e ^iwlwifi | xargs /sbin/rmmod) \\\n&& /sbin/modprobe -r mac80211" } ++ } diff -Nru augeas-0.10.0/debian/patches/series augeas-0.10.0/debian/patches/series --- augeas-0.10.0/debian/patches/series 2012-05-20 03:49:39.000000000 -0500 +++ augeas-0.10.0/debian/patches/series 2012-09-24 22:53:12.000000000 -0500 @@ -8,3 +8,4 @@ cpp-linkage.patch gnulib-build-out-of-source.patch regexp-escape.patch +augeas-split-lines.patch --===============3400407790400870048==-- -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
