[pkg-wicd-maint] Bug#928428: unblock: [pre-approval] wicd/1.7.4+tb2-7
Salvo Tomaselli
tiposchi at tiscali.it
Sun May 5 11:58:23 BST 2019
Well I use isc-dhcp-client and it works fine so I guess it is an ok change.
Il giorno sab 4 mag 2019 alle ore 15:41 Axel Beckert <abe at debian.org>
ha scritto:
>
> Hi,
>
> Axel Beckert wrote:
> > I'll prepare a feature branch for this in git including a planned
> > debdiff and let you know once it's ready for review/upload. I though
> > would happy to receive feedback from the release team beforehand.
>
> Preliminary (and obviously not yet finished) patch as of the branch
> "buster" at https://salsa.debian.org/debian/wicd/tree/buster:
>
> diff --git a/debian/changelog b/debian/changelog
> index aa96f2b..0e00a8b 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,17 @@
> +wicd (1.7.4+tb2-7) UNRELEASED; urgency=medium
> +
> + [ Axel Beckert ]
> + TODO: Test on a machine with dhcpcd5 only before uploading!
> +
> + * Don't list dhcpcd5 as preferred DHCP client in the alternative
> + dependencies list. (Closes: #901592)
> + * Look for "dhcpcd5" instead of "dhcpcd". (Closes: #852343)
> +
> + [ Ondřej Nový ]
> + * d/copyright: Change Format URL to correct one
> +
> + -- Axel Beckert <abe at debian.org> Fri, 15 Jun 2018 12:38:12 +0200
> +
> wicd (1.7.4+tb2-6) unstable; urgency=low
>
> * Set "Rules-Requires-Root: no".
> diff --git a/debian/control b/debian/control
> index 9869ef6..6c5c4e8 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -42,7 +42,7 @@ Package: wicd-daemon
> Architecture: all
> Depends: adduser,
> dbus,
> - dhcpcd5 | isc-dhcp-client | pump | udhcpc,
> + isc-dhcp-client | pump | udhcpc | dhcpcd5,
> iputils-ping | inetutils-ping,
> lsb-base (>= 3.2-13),
> psmisc,
> diff --git a/debian/copyright b/debian/copyright
> index 8f973c9..a6f30e0 100644
> --- a/debian/copyright
> +++ b/debian/copyright
> @@ -1,4 +1,4 @@
> -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
> +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
> Source: https://launchpad.net/wicd/+download
>
> Files: *
> diff --git a/debian/patches/46-dhcpcd_is_now_dhcpcd5.patch b/debian/patches/46-dhcpcd_is_now_dhcpcd5.patch
> new file mode 100644
> index 0000000..71cfd2f
> --- /dev/null
> +++ b/debian/patches/46-dhcpcd_is_now_dhcpcd5.patch
> @@ -0,0 +1,147 @@
> +Description: Update binary names from dhcpcd to dhcpcd5
> +Author: Axel Beckert <abe at debian.org>
> +Bug-Debian: https://bugs.debian.org/852343
> +Forwarded: no
> +
> +--- a/data/wicd.ui
> ++++ b/data/wicd.ui
> +@@ -1226,7 +1226,7 @@
> + </child>
> + <child>
> + <object class="GtkRadioButton" id="dhcpcd_radio">
> +- <property name="label">dhcpcd</property>
> ++ <property name="label">dhcpcd5</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">False</property>
> +--- a/in/man=nl=wicd-manager-settings.conf.5.in
> ++++ b/in/man=nl=wicd-manager-settings.conf.5.in
> +@@ -39,7 +39,7 @@
> + .br
> + 1 = dhclient
> + .br
> +-2 = dhcpcd
> ++2 = dhcpcd5
> + .br
> + 3 = pump
> + .TP
> +--- a/in/man=nl=wicd.8.in
> ++++ b/in/man=nl=wicd.8.in
> +@@ -37,7 +37,7 @@
> + Wicd gebruikt ingebouwde Linux draadloze netwerktools, zoals ifconfig en
> + iwconfig, om netwerkinformatie te krijgen en in te stellen. Er is enige
> + flexibiliteit in het gebruik van DHCP, door het ondersteunen van dhclient,
> +-dhcpcd en pump. Wicd gebruikt wpa_supplicant voor alle draadloze
> ++dhcpcd5 en pump. Wicd gebruikt wpa_supplicant voor alle draadloze
> + coderingsinstellingen, en gebruikt een sjabloongebaseert systeem om de
> + configuratiebestanden te maken die door wpa_supplicant worden gebruikt. Deze
> + sjablonen kunnen worden bewerkt, en nieuwe sjablonen kunnen worden gemaakt door
> +@@ -153,7 +153,7 @@
> + .BR mii-tool (8),
> + .BR ethtool (8),
> + .BR dhclient (8),
> +-.BR dhcpcd (8),
> ++.BR dhcpcd5 (8),
> + .BR pump (8).
> +
> +
> +--- a/in/man=wicd-manager-settings.conf.5.in
> ++++ b/in/man=wicd-manager-settings.conf.5.in
> +@@ -39,7 +39,7 @@
> + .br
> + 1 = dhclient
> + .br
> +-2 = dhcpcd
> ++2 = dhcpcd5
> + .br
> + 3 = pump
> + .TP
> +--- a/in/man=wicd.8.in
> ++++ b/in/man=wicd.8.in
> +@@ -35,7 +35,7 @@
> +
> + Wicd uses built-in linux wireless-tools, such as ifconfig and iwconfig, to
> + get and configure network info. There is some flexibility in its use of DHCP,
> +-providing support for dhclient, dhcpcd, and pump. Wicd uses wpa_supplicant
> ++providing support for dhclient, dhcpcd5, and pump. Wicd uses wpa_supplicant
> + to handle all wireless encryption settings, and uses a template-based system
> + to create the configuration files used by wpa_supplicant. These templates
> + can be edited, and new templates can be created by the user and imported into
> +@@ -178,7 +178,7 @@
> + .BR mii-tool (8),
> + .BR ethtool (8),
> + .BR dhclient (8),
> +-.BR dhcpcd (8),
> ++.BR dhcpcd5 (8),
> + .BR pump (8).
> +
> +
> +--- a/wicd/wnettools.py
> ++++ b/wicd/wnettools.py
> +@@ -307,7 +307,7 @@
> + def get_client_name(cl):
> + """ Converts the integer value for a dhcp client to a string. """
> + if self.dhcpcd_cmd and cl in [misc.DHCPCD, misc.AUTO]:
> +- client = "dhcpcd"
> ++ client = "dhcpcd5"
> + cmd = self.dhcpcd_cmd
> + elif self.pump_cmd and cl in [misc.PUMP, misc.AUTO]:
> + client = "pump"
> +@@ -344,7 +344,7 @@
> + 'release' : r"%(cmd)s -r -i %(iface)s",
> + 'id' : misc.PUMP,
> + },
> +- "dhcpcd" :
> ++ "dhcpcd5" :
> + {'connect' : r"%(cmd)s --noipv4ll %(extra)s %(iface)s",
> + 'connect_with_hostname' : r"%(cmd)s -h %(hostname)s --noipv4ll %(extra)s %(iface)s ",
> + 'release' : r"%(cmd)s -k %(iface)s",
> +@@ -364,7 +364,7 @@
> + if client_name == "dhclient" and flavor:
> + if hostname:
> + print 'attempting to set hostname with dhclient'
> +- print 'using dhcpcd or another supported client may work better'
> ++ print 'using dhcpcd5 or another supported client may work better'
> +
> + dhclient_template = \
> + open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r')
> +@@ -392,7 +392,7 @@
> + # set up (optional) extra arguments to the dhcp client,
> + # used for disabling the resolv.conf update of dhcpd
> + extra_args = ""
> +- if staticdns and client_name == "dhcpcd":
> ++ if staticdns and client_name == "dhcpcd5":
> + extra_args = "--nohook resolv.conf"
> +
> + if hostname:
> +@@ -455,7 +455,7 @@
> + self.dhclient_needs_verbose = True
> + else:
> + self.dhclient_needs_verbose = False
> +- self.dhcpcd_cmd = self._find_program_path("dhcpcd")
> ++ self.dhcpcd_cmd = self._find_program_path("dhcpcd5")
> + self.pump_cmd = self._find_program_path("pump")
> + self.udhcpc_cmd = self._find_program_path("udhcpc")
> +
> +@@ -599,10 +599,10 @@
> + return self._check_dhcp_result(pump_success)
> +
> + def _parse_dhcpcd(self, pipe):
> +- """ Determines if obtaining an IP using dhcpcd succeeded.
> ++ """ Determines if obtaining an IP using dhcpcd5 succeeded.
> +
> + Keyword arguments:
> +- pipe -- stdout pipe to the dhcpcd process.
> ++ pipe -- stdout pipe to the dhcpcd5 process.
> +
> + Returns:
> + 'success' if succesful, an error code string otherwise.
> +@@ -626,7 +626,7 @@
> + """ Determines if obtaining an IP using udhcpc succeeded.
> +
> + Keyword arguments:
> +- pipe -- stdout pipe to the dhcpcd process.
> ++ pipe -- stdout pipe to the dhcpcd5 process.
> +
> + Returns:
> + 'success' if successful, an error code string otherwise.
> diff --git a/debian/patches/series b/debian/patches/series
> index 81a29b0..f82f16d 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -12,3 +12,4 @@
> 43-fix-wrong-Galician-translation.patch
> 44-fix_wicd-curses_AttributeError_in_keypress-function.patch
> 45-update_systemd_service_file.patch
> +46-dhcpcd_is_now_dhcpcd5.patch
>
> Regards, Axel
> --
> ,''`. | Axel Beckert <abe at debian.org>, https://people.debian.org/~abe/
> : :' : | Debian Developer, ftp.ch.debian.org Admin
> `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
> `- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
>
> _______________________________________________
> pkg-wicd-maint mailing list
> pkg-wicd-maint at alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-wicd-maint
--
Salvo Tomaselli
"Io non mi sento obbligato a credere che lo stesso Dio che ci ha dotato di
senso, ragione ed intelletto intendesse che noi ne facessimo a meno."
-- Galileo Galilei
http://ltworf.github.io/ltworf/
More information about the pkg-wicd-maint
mailing list