X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 5CCBEDC2C02 for ; Thu, 15 Oct 2015 07:06:09 +0000 (UTC) Received: from newmail.tetrasec.net (unknown [74.117.189.116]) by mail.alpinelinux.org (Postfix) with ESMTP id 236D5DC00AF for ; Thu, 15 Oct 2015 07:06:09 +0000 (UTC) Received: from ncopa-desktop.alpinelinux.org (unknown [79.160.13.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by newmail.tetrasec.net (Postfix) with ESMTPSA id E1DF25A7F3B; Thu, 15 Oct 2015 06:55:40 +0000 (GMT) Date: Thu, 15 Oct 2015 09:06:04 +0200 From: Natanael Copa To: =?ISO-8859-1?B?U/ZyZW4=?= Tempel Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] main/wpa_supplicant: copy a config file based on defconfig Message-ID: <20151015090604.15e14a13@ncopa-desktop.alpinelinux.org> In-Reply-To: <1444228684-2361-1-git-send-email-soeren+git@soeren-tempel.net> References: <1444228684-2361-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Scanned: ClamAV using ClamSMTP On Wed, 7 Oct 2015 16:38:04 +0200 S=F6ren Tempel wrote: > Instead of appending configuration variables to the .config file > manually. This has the advantage that configuration option can easily be > adjusted and are well documented in addition to that options that have > been removed on package upgrade can be identified easier. Generally, I prefer to use upstream default config from upstream source package rather than to have a fork of the default config. If upstream add/remove default config we normally want follow that. Then we only maintain the changes. If we still want to fork the config this way, then I think we should do this in 2 steps. First is make a config that is identical to current config but just have the new format. Second we implement the changes from what we currently have til the new stuff, CONFIG_EAP_FAST, readline, smartcard etc. The reason is that if we change format and change config in same commit it becomes very hard to see what as actually changed in case something break. If we need revert the change due to users being unhappy then we would end up revert both config format change and config change while we only would want revert the config change. =20 > Many options enabled before where no longer mentioned in the defconfig > file and have thus been removed. The 'CONFIG_EAP_FAST' option has been > enabled additionally. As said. config change should be in separate commit as the config format change commit to make it more visisble what is actually going on and to avoid unintented config changes. > I also had to add readline-dev and pcsc-lite-dev to the makedepends. > readlinee-dev is needed for readline support in wpa_cli and > pcsc-lite-dev is needed for smartcard support. Both options were > enabled before. But it does not seem like current wpa_supplicant was built with either. I don't mind to add the functionality of readline but I would really like to avoid GNU readline implementation if possible. There are libedit, linenoise and it also looks like wpa_supplicant has its own readline-like implementation. pcsc-lite-dev is ok though. =20 > Since this is a rather important package I would suggested that this > is tested by someone else before merging it into the master branch. I > tested it here and it works for my setup, which doesn't mean that I > accidentally broke more complicated setups by failing to copy an > existing configuration option. I would like to break up the commit in various minor changes so we can easily revert if needed. Doing changes in small steps will also make it easier to figure out what change causes potensial breakages. ... > --- a/main/wpa_supplicant/wpa_cli.sh > +++ b/main/wpa_supplicant/wpa_cli.sh > @@ -9,7 +9,7 @@ if [ -z "${1}" -o -z "${2}" ]; then > logger -t wpa_cli "this script should be called from > wpa_cli(8)" exit 1 > elif ! [ -x "${IFUP}" -a -x "${IFDOWN}" ]; then > - logger -t wpa_cli "/sbin/ifup or /sbin/ifdown doesn't exist" > + logger -t wpa_cli "${IFUP} or ${IFDOWN} doesn't exist" > exit 1 > fi > =20 this change looks ok but i'd like it in separate commit with commit message that correspond to the change. -nc --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---