Merge lp:~javier-lopez/ubuntu/trusty/wicd/fix-1132529 into lp:ubuntu/trusty/wicd

[Javier López]

[Javier López (javier-lopez)]

The proposed change allow wicd-daemon to start when /etc/resolv is a broken link (which happens by default in Ubuntu 13.04 and 14.04 at least). It's distantly related to debian report #691973. Credits go to mesilliac which provided the original patch at:

https://bugs.launchpad.net/wicd/+bug/1193856

[Robie Basak (racb)]

Thank you for bringing this patch forward. A couple of things stop me from being able to conclude whether this patch should be uploaded or not:

1. No dep3 headers in the quilt patch, which might have given me this information: http://dep.debian.net/deps/dep3/

2.

resolvconf is in Debian too, so this issue probably also affects Debian, right? And upstream? We prefers bugs to be fixed as far upstream as possible so that we don't have to maintain a delta. Is there any particular reason this is not appropriate here?

We can add a delta if we have to in order to make a release, of course, but it would be preferable for the patch to also have been sent upstream for later inclusion, so that we can at least drop the delta later.

If you just want the bug fixed eventually, then sending the patch further upstream would be appropriate, and then Ubuntu will autosync a more future package release from Debian.

Please could you clarify what the situation is with this here?

review: Needs Information

[Javier López (javier-lopez)]

Hi, thanks for your reply

1.- Yeah, I know of dep3, however the edit-patch I used (featured in the ubuntu developer guide, packaging.ubuntu.com) doesn't add dep3 headers and I didn't think such minimalist patch would require one. If it's required I'll add it =)

2.- Yep, probably, although I've not test it (I don't have a debian machine nearby), not sure if I should open a bug there without testing first =/ , I've previous bad experience in debian (basically everything I report|request there use to be ignored, so I'm not sure if I should report yet another bug). I however could open an issue on lp:wicd and see if authors reply anything. The fix could go eventually from upstream -> debian -> ubuntu deleting the delta.

[Robie Basak (racb)]

> If it's required I'll add it =)

We would prefer that you did. In this case, the value of your "Forwarded" field would have helped me :)

I don't think it's reasonable to land a patch in Ubuntu without somebody testing it.

> I've previous bad experience in debian

Remember that in Debian each package has its own maintainer or sets of maintainers. Unless you have had a bad experience with the wicd maintainers specifically, you shouldn't take your experience to mean much in this case.

We can be pragmatic about this. If the (tested) fix gets ignored upstream, then we can link to the bug from our bug, and make the change ahead of it being looked at upstream to help Ubuntu users. But we should, at the minimum, have offered the patch upstream and documented this reason for introducing an Ubuntu delta in the bug.

[Javier López (javier-lopez)]

Actually the issue in lp:wicd has already been opened:

https://bugs.launchpad.net/wicd/+bug/1193856

I've requested the merge: https://code.launchpad.net/~chilicuil/wicd/wicd/+merge/198057

In the meantime, as it gets accepted|rejected or ignored I've set up a ppa:

https://launchpad.net/~chilicuil/+archive/proposed-fixes

[lp:~javier-lopez/ubuntu/trusty/wicd/fix-1132529]

31. By Javier López on 2013-12-06

Add dep3 headers for patches/34-fix-resolv.conf_backup-restore-broken-link.patch

[Javier López (javier-lopez)]

> > If it's required I'll add it =)
>
> We would prefer that you did. In this case, the value of your "Forwarded"
> field would have helped me :)
>
> I don't think it's reasonable to land a patch in Ubuntu without somebody
> testing it.

I've tested it on Ubuntu trusty, I've not test it on Debian, that's what I was referring me to =)

>
> > I've previous bad experience in debian
>
> Remember that in Debian each package has its own maintainer or sets of
> maintainers. Unless you have had a bad experience with the wicd maintainers
> specifically, you shouldn't take your experience to mean much in this case.
>
> We can be pragmatic about this. If the (tested) fix gets ignored upstream,
> then we can link to the bug from our bug, and make the change ahead of it
> being looked at upstream to help Ubuntu users. But we should, at the minimum,
> have offered the patch upstream and documented this reason for introducing an
> Ubuntu delta in the bug.

Yes, it sounds reasonable, I've forwarded the patch to upstream:

https://code.launchpad.net/~chilicuil/wicd/wicd/+merge/198057

Thanks again for your comments

[Iain Lane (laney)]

I see Debian has some related patches in this area

  http://anonscm.debian.org/gitweb/?p=collab-maint/wicd.git;a=blob;f=debian/patches/04-fix_resolv.conf_backup-restore.patch;h=25903d6cfdeee3dced21608c451272dfcfb65ce6;hb=HEAD

It'd be really great if you could forward your patch to the maintainer as this patch indicates to me that he's interested in this kind of issue.

If you reply on this bug once you've done that I'll get emailed and then can upload for you.

[Javier López (javier-lopez)]

Hi Iain, thanks for replying,

I've forwarded the patch to Debian:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732739

Best regards

[Iain Lane (laney)]

Thanks for doing that! I've uploaded to trusty now. :-)

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-07 18:42:23 +0000
+++ debian/changelog	2013-12-06 14:09:27 +0000
@@ -1,3 +1,11 @@
+wicd (1.7.2.4-4.1ubuntu1) trusty; urgency=low
+
+  * debian/patches/34-fix-resolv.conf_backup-restore-broken-link.patch:
+    allow wicd-daemon to start when /etc/resolv.conf is a broken link
+    (LP: #1132529)
+
+ -- Javier P.L. <[e-mail]>  Fri, 06 Dec 2013 01:02:49 -0600
+
 wicd (1.7.2.4-4.1) unstable; urgency=low
 
   * Non-maintainer upload

=== added file 'debian/patches/34-fix-resolv.conf_backup-restore-broken-link.patch'
--- debian/patches/34-fix-resolv.conf_backup-restore-broken-link.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/34-fix-resolv.conf_backup-restore-broken-link.patch	2013-12-06 14:09:27 +0000
@@ -0,0 +1,15 @@
+## Description: fix /etc/resolv.conf resolution when it's a relative sysmlink
+## Forwarded: yes https://code.launchpad.net/~chilicuil/ubuntu/trusty/wicd/fix-1132529/+merge/197998
+## Bug: https://bugs.launchpad.net/wicd/+bug/1193856
+## Author: Tommy (mesilliac)
+--- a/wicd/wicd-daemon.py
++++ b/wicd/wicd-daemon.py
+@@ -1702,7 +1702,7 @@ def main(argv):
+         backup_location = wpath.varlib + 'resolv.conf.orig'
+         # don't back up if .orig exists, probably there cause
+         # wicd exploded
+-        if not os.path.exists(backup_location):
++        if not os.path.exists(backup_location) and not os.path.islink(backup_location):
+             if os.path.islink('/etc/resolv.conf'):
+                 dest = os.readlink('/etc/resolv.conf')
+                 os.symlink(dest, backup_location)

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-06-07 18:42:23 +0000
+++ debian/patches/series	2013-12-06 14:09:27 +0000
@@ -5,3 +5,4 @@
 26-support_etc-network_scripts.patch
 32-prefer_gksu.patch
 33-focus_property.patch
+34-fix-resolv.conf_backup-restore-broken-link.patch