[OpenWrt-Devel] merge: add OpenWrt branding

Given that we've decided to sail under the same flag for
the benefit of the whole community, and acknowledge the
achievements of the LEDE project, let's start the final
steps of the merge.
    
The git and other sources are untouched until the infra merge.
    
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

On 24 October 2017 at 19:46, Zoltan HERPAI <wigyori@uid0.hu> wrote:
> Given that we've decided to sail under the same flag for
> the benefit of the whole community, and acknowledge the
> achievements of the LEDE project, let's start the final
> steps of the merge.
>
> The git and other sources are untouched until the infra merge.
>
> Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>

...

> diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
> index a8311fc..bbed567 100755
> --- a/package/base-files/files/bin/config_generate
> +++ b/package/base-files/files/bin/config_generate
> @@ -223,7 +223,7 @@ generate_static_system() {
>         uci -q batch <<-EOF
>                 delete system.@system[0]
>                 add system system
> -               set system.@system[-1].hostname='LEDE'
> +               set system.@system[-1].hostname='OpenWrt'
>                 set system.@system[-1].timezone='UTC'
>                 set system.@system[-1].ttylogin='0'
>                 set system.@system[-1].log_size='64'
> @@ -233,10 +233,10 @@ generate_static_system() {
>                 set system.ntp='timeserver'
>                 set system.ntp.enabled='1'
>                 set system.ntp.enable_server='0'
> -               add_list system.ntp.server='0.lede.pool.ntp.org'
> -               add_list system.ntp.server='1.lede.pool.ntp.org'
> -               add_list system.ntp.server='2.lede.pool.ntp.org'
> -               add_list system.ntp.server='3.lede.pool.ntp.org'
> +               add_list system.ntp.server='0.openwrt.pool.ntp.org'
> +               add_list system.ntp.server='1.openwrt.pool.ntp.org'
> +               add_list system.ntp.server='2.openwrt.pool.ntp.org'
> +               add_list system.ntp.server='3.openwrt.pool.ntp.org'
>         EOF
>
>         if json_is_a system object; then
> diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
> index 4ec646a..af51b5a 100644
> --- a/package/base-files/files/etc/banner
> +++ b/package/base-files/files/etc/banner
> @@ -1,10 +1,13 @@
> -     _________
> -    /        /\      _    ___ ___  ___
> -   /  LE    /  \    | |  | __|   \| __|
> -  /    DE  /    \   | |__| _|| |) | _|
> - /________/  LE  \  |____|___|___/|___|                      lede-project.org
> - \        \   DE /
> -  \    LE  \    /  -----------------------------------------------------------
> -   \  DE    \  /    %N (%V, %C)
> -    \________\/    -----------------------------------------------------------
> -
> +  _______                     ________        __
> + |       |.-----.-----.-----.|  |  |  |.----.|  |_
> + |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
> + |_______||   __|_____|__|__||________||__|  |____|
> +          |__| W I R E L E S S   F R E E D O M
> + -----------------------------------------------------
> + DESIGNATED DRIVER (%C, %R)
> + -----------------------------------------------------
> +  * 2 oz. Orange Juice         Combine all juices in a
> +  * 2 oz. Pineapple Juice      tall glass filled with
> +  * 2 oz. Grapefruit Juice     ice, stir well.
> +  * 2 oz. Cranberry Juice
> + -----------------------------------------------------

Hi,

Changing the logo is okay, but I'd like to propose that we continue to
use LEDE's current numbering scheme of the form YY.MM.  It's simpler
and more straightforward and will make the transition process more
smooth as new releases will continue to use LEDE's codebase and build
infrastructure.

Links like http://www.{lede-project,openwrt}.org/bugs need to be
examined and fixed first.  Infrastructures like NTP servers will need
to keep running until maybe the EOL of kernel 4.4

                yousong

Hi,

comments inline.

> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

Given the fact that we explicitely wanted to avoid @openwrt.org mails
and that this was one of the discussion points leading to the split I
find it delicate to seal the merging commit with exactly such a S-o-b.

Combined with ...

  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
  Tue, 18 Oct 2016 11:42:06 +0200

... this looks to me like nothing was learned from past experiences and
that all that matters here is having the own name attached to the work
being done.


Anyhow, on to the code.

> diff --git a/Config.in b/Config.in
> index ddbc4e2..d30c048 100644
> --- a/Config.in
> +++ b/Config.in

[...]

>  VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
> -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
> +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots)

We need to setup the server first or delegate downloads.openwrt.org to
downloads.lede-project.org or add a rewrite rule to redirect
http://downloads.openwrt.org/snapshots/(.*) to
http://downloads.lede-project.org/snapshots/$1 for now.

>  VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
> -VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
> +VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)

Likewise.

>  VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
> -VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
> +VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.openwrt.org/)

Undecided.

>  
>  VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
>  VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)

[...]

> diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
> index 4ec646a..af51b5a 100644
> --- a/package/base-files/files/etc/banner
> +++ b/package/base-files/files/etc/banner
> @@ -1,10 +1,13 @@
> -     _________
> -    /        /\      _    ___ ___  ___
> -   /  LE    /  \    | |  | __|   \| __|
> -  /    DE  /    \   | |__| _|| |) | _|
> - /________/  LE  \  |____|___|___/|___|                      lede-project.org
> - \        \   DE /
> -  \    LE  \    /  -----------------------------------------------------------
> -   \  DE    \  /    %N (%V, %C)
> -    \________\/    -----------------------------------------------------------
> -
> +  _______                     ________        __
> + |       |.-----.-----.-----.|  |  |  |.----.|  |_
> + |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
> + |_______||   __|_____|__|__||________||__|  |____|
> +          |__| W I R E L E S S   F R E E D O M
> + -----------------------------------------------------
> + DESIGNATED DRIVER (%C, %R)

Please replace "DESIGNATED DRIVER" with "%N". "%V, %C" (17.01.4,
r3560-79f57e422d) are more useful under the new version scheme than "%C,
%R" (r3560-79f57e422d, r3560-79f57e422d)

> + -----------------------------------------------------
> +  * 2 oz. Orange Juice         Combine all juices in a
> +  * 2 oz. Pineapple Juice      tall glass filled with
> +  * 2 oz. Grapefruit Juice     ice, stir well.
> +  * 2 oz. Cranberry Juice
> + -----------------------------------------------------
> diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
> index 8c5f677..54c0e3e 100755
> --- a/package/base-files/files/etc/init.d/system
> +++ b/package/base-files/files/etc/init.d/system
> @@ -7,7 +7,7 @@ USE_PROCD=1
>  validate_system_section()
>  {
>  	uci_validate_section system system "${1}" \
> -		'hostname:string:lede' \
> +		'hostname:string:openwrt' \

While we're at it we should properly capitalize the default to "OpenWrt".

>  		'conloglevel:uinteger' \
>  		'buffersize:uinteger' \
>  		'timezone:string:UTC' \

[...]

> diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
> index 6b8be1c..fd8365a 100755
> --- a/package/network/services/uhttpd/files/uhttpd.init
> +++ b/package/network/services/uhttpd/files/uhttpd.init
> @@ -52,7 +52,7 @@ generate_keys() {
>  	[ -n "$GENKEY_CMD" ] && {
>  		$GENKEY_CMD \
>  			-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
> -			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-Lede}$UNIQUEID"/CN="${commonname:-Lede}"
> +			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"

Maybe we should adjust the defaults here to match the shipped config.

>  		sync
>  		mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
>  		mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
> diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
> index 14a33c5..c9ef626 100644
> --- a/package/network/utils/iproute2/Makefile
> +++ b/package/network/utils/iproute2/Makefile
> @@ -108,7 +108,7 @@ define Build/Configure
>  		$(PKG_BUILD_DIR)/Makefile
>  	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
>  		$(PKG_BUILD_DIR)/Makefile
> -	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-lede\";" \
> +	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
>  		> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
>  endef
>  
> diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
> index 79059e5..2a8d9dd 100644
> --- a/package/utils/busybox/Config-defaults.in
> +++ b/package/utils/busybox/Config-defaults.in
> @@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
>  config BUSYBOX_DEFAULT_NSLOOKUP
>  	bool
>  	default n
> -config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
> +config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT

Need to adjust the patch file accordingly.

>  	bool
>  	default y
> -config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> +config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS

Dito.

>  	bool
>  	default n
>  config BUSYBOX_DEFAULT_NTPD
> diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
> index 14875d5..2d2a1c4 100644
> --- a/package/utils/busybox/config/networking/Config.in
> +++ b/package/utils/busybox/config/networking/Config.in
> @@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
>  	default BUSYBOX_DEFAULT_NSLOOKUP
>  	help
>  	  nslookup is a tool to query Internet name servers.
> -config BUSYBOX_CONFIG_NSLOOKUP_LEDE
> +config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT

Dito.

>  	bool "nslookup_lede"
>  	depends on !BUSYBOX_CONFIG_NSLOOKUP
> -	default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
> +	default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT

Dito.

>  	help
> -	  nslookup is a tool to query Internet name servers (LEDE flavor).
> +	  nslookup is a tool to query Internet name servers (OpenWrt flavor).
>  
> -config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> +config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS

Dito.

>         bool "Enable long options"
> -       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
> -       depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
> +       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
> +       depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
>         help
>           Support long options for the nslookup applet.
>  config BUSYBOX_CONFIG_NTPD

[...]

Hello Zoltan, Hauke,

Just one, small comment, inline below.

On 24.10.2017 13:46, Zoltan HERPAI wrote:

[...]

> diff --git a/include/image-commands.mk b/include/image-commands.mk
> index aaece70..3507578 100644
> --- a/include/image-commands.mk
> +++ b/include/image-commands.mk
> @@ -7,7 +7,7 @@ define Build/uImage
>   	mkimage -A $(LINUX_KARCH) \
>   		-O linux -T kernel \
>   		-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
> -		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION))' -d $@ $@.new
> +		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION))' -d $@ $@.new

I think it would make sense to use VERSION_DIST(_SANITIZED) variable 
here (and in all similar places below) instead of hardcoded value.

On Tue, Oct 24, 2017 at 03:07:04PM +0200, Jo-Philipp Wich wrote:
> Hi,
> 
> comments inline.
> 
> > Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
> 
> Given the fact that we explicitely wanted to avoid @openwrt.org mails
> and that this was one of the discussion points leading to the split I
> find it delicate to seal the merging commit with exactly such a S-o-b.
> 
> Combined with ...
> 
>   $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>   Tue, 18 Oct 2016 11:42:06 +0200
> 
> ... this looks to me like nothing was learned from past experiences and
> that all that matters here is having the own name attached to the work
> being done.

I agree. Despite the domain name being handed over it still looks like
the openwrt.org infrastructure is the hands of a single person, which
was the precise cause for the fork...
What about handing this AS over to the SPI as well? Or at least have
several admin-c registered?

(I'm aware that this might not be the best moment to discuss this, we
all could have thought about that a bit earlier...)

[daniel@box ~]$ host -t MX openwrt.org
openwrt.org mail is handled by 10 mail.openwrt.org.
[daniel@box ~]$ host mail.openwrt.org.
mail.openwrt.org has address 78.24.191.176
[daniel@box ~]$ whois 78.24.191.176
% This is the RIPE Database query service.
% The objects are in RPSL format.
%
% The RIPE Database is subject to Terms and Conditions.
% See http://www.ripe.net/db/support/db-terms-conditions.pdf

% Note: this output has been filtered.
%       To receive output for a database update, use the "-B" flag.

% Information related to '78.24.191.176 - 78.24.191.191'

% Abuse contact for '78.24.191.176 - 78.24.191.191' is 'abuse@atw.co.hu'

inetnum:        78.24.191.176 - 78.24.191.191
netname:        HU-ATW-OPENWRT
descr:          OpenWrt project
country:        HU
admin-c:        BIK4-RIPE
tech-c:         BIK4-RIPE
mnt-by:         MNT-ATW
status:         ASSIGNED PA
created:        2009-06-17T08:51:36Z
last-modified:  2009-06-17T08:51:36Z
source:         RIPE # Filtered

person:         Bertalan Imre Kaloz
address:        Berkocsis utca 18.
address:        H-1084 Budapest
address:        Hungary
phone:          +36 70 3136791
nic-hdl:        BIK4-RIPE
mnt-by:         MNT-ATW
created:        2009-06-17T08:51:36Z
last-modified:  2009-06-17T08:51:36Z
source:         RIPE

% Information related to '78.24.188.0/22AS41075'

route:          78.24.188.0/22
descr:          ATW Internet Kft.
descr:          Budapest, Hungary
origin:         AS41075
mnt-by:         MNT-ATW
created:        2014-12-03T11:50:32Z
last-modified:  2014-12-03T11:50:32Z
source:         RIPE # Filtered

% This query was served by the RIPE Database Query Service version 1.90 (ANGUS)

Zoltan HERPAI kirjoitti 24.10.2017 klo 14:46:
> Given that we've decided to sail under the same flag for
> the benefit of the whole community, and acknowledge the
> achievements of the LEDE project, let's start the final
> steps of the merge.
>      
> The git and other sources are untouched until the infra merge.
>      
> ...
> --- a/package/base-files/files/etc/banner
> +++ b/package/base-files/files/etc/banner
> @@ -1,10 +1,13 @@
> -     _________
> -    /        /\      _    ___ ___  ___
> -   /  LE    /  \    | |  | __|   \| __|
> -  /    DE  /    \   | |__| _|| |) | _|
> - /________/  LE  \  |____|___|___/|___|                      lede-project.org
> - \        \   DE /
> -  \    LE  \    /  -----------------------------------------------------------
> -   \  DE    \  /    %N (%V, %C)
> -    \________\/    -----------------------------------------------------------
> -
> +  _______                     ________        __
> + |       |.-----.-----.-----.|  |  |  |.----.|  |_
> + |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
> + |_______||   __|_____|__|__||________||__|  |____|
> +          |__| W I R E L E S S   F R E E D O M
> + -----------------------------------------------------
> + DESIGNATED DRIVER (%C, %R)
> + -----------------------------------------------------
> +  * 2 oz. Orange Juice         Combine all juices in a
> +  * 2 oz. Pineapple Juice      tall glass filled with
> +  * 2 oz. Grapefruit Juice     ice, stir well.
> +  * 2 oz. Cranberry Juice
> + -----------------------------------------------------


Please do not re-introduce hard-coded version branding into various files.

All version info was centralised to include/version.mk by this commit:

https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68

and further refined with

https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68

Having hard-coded versions scattered around in various files proved to be 
cumbersome at several Openwrt releases, as some of the hard-coded names were 
forgotten to be changed in connection to several releases.

In LEDE sources the variables like "%N (%V, %C)" take nicely care of the 
version branding also in /etc/banner, also including the version name.

Using hard-coded name like "DESIGNATED DRIVER (%C, %R)" would be a clear step 
backwards.



Ps.

And are the drinks really back on the menu?
<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <div class="moz-cite-prefix">Zoltan HERPAI kirjoitti 24.10.2017 klo
      14:46:<br>
    </div>
    <blockquote type="cite"
      cite="mid:%3C1508845578-30041-1-git-send-email-wigyori@uid0.hu%3E">
      <pre wrap="">Given that we've decided to sail under the same flag for
the benefit of the whole community, and acknowledge the
achievements of the LEDE project, let's start the final
steps of the merge.
    
The git and other sources are untouched until the infra merge.
    
...</pre>
    </blockquote>
    <blockquote type="cite"
      cite="mid:%3C1508845578-30041-1-git-send-email-wigyori@uid0.hu%3E">
      <pre wrap="">--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -1,10 +1,13 @@
-     _________
-    /        /\      _    ___ ___  ___
-   /  LE    /  \    | |  | __|   \| __|
-  /    DE  /    \   | |__| _|| |) | _|
- /________/  LE  \  |____|___|___/|___|                      lede-project.org
- \        \   DE /
-  \    LE  \    /  -----------------------------------------------------------
-   \  DE    \  /    %N (%V, %C)
-    \________\/    -----------------------------------------------------------
-
+  _______                     ________        __
+ |       |.-----.-----.-----.|  |  |  |.----.|  |_
+ |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
+ |_______||   __|_____|__|__||________||__|  |____|
+          |__| W I R E L E S S   F R E E D O M
+ -----------------------------------------------------
+ DESIGNATED DRIVER (%C, %R)
+ -----------------------------------------------------
+  * 2 oz. Orange Juice         Combine all juices in a
+  * 2 oz. Pineapple Juice      tall glass filled with
+  * 2 oz. Grapefruit Juice     ice, stir well.
+  * 2 oz. Cranberry Juice
+ -----------------------------------------------------
</pre>
    </blockquote>
    <p><br>
    </p>
    <p>Please do not re-introduce hard-coded version branding into
      various files.</p>
    All version info was centralised to include/version.mk by this
    commit:
    <p><a class="moz-txt-link-freetext" href="https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68">https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68</a></p>
    <p>and further refined with</p>
    <p><a class="moz-txt-link-freetext" href="https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68">https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68</a><br>
    </p>
    <p>Having hard-coded versions scattered around in various files
      proved to be cumbersome at several Openwrt releases, as some of
      the hard-coded names were forgotten to be changed in connection to
      several releases.</p>
    In LEDE sources the variables like "%N (%V, %C)" take nicely care of
    the version branding also in /etc/banner, also including the version
    name. <br>
    <p>Using hard-coded name like "DESIGNATED DRIVER (%C, %R)" would be
      a clear step backwards.</p>
    <p><br>
    </p>
    <p><br>
    </p>
    <p>Ps.</p>
    <p>And are the drinks really back on the menu?</p>
    <p><br>
    </p>
  </body>
</html>

Hi Hannu,

On Tue, 24 Oct 2017, Hannu Nyman wrote:

> Zoltan HERPAI kirjoitti 24.10.2017 klo 14:46:
>> Given that we've decided to sail under the same flag for
>> the benefit of the whole community, and acknowledge the
>> achievements of the LEDE project, let's start the final
>> steps of the merge.
>>      The git and other sources are untouched until the infra merge.
>>      ...
>
>> @@ -1,10 +1,13 @@
>> -   \  DE    \  /    %N (%V, %C)
>> + DESIGNATED DRIVER (%C, %R)
> Please do not re-introduce hard-coded version branding into various files.
>
> All version info was centralised to include/version.mk by this commit:
>
> https://github.com/lede-project/source/commit/3193053df7d27bde82fbcc310e4404cc43f39313#diff-d08225593c57fc07ce549597f7fd4c68
>
> and further refined with
>
> https://github.com/lede-project/source/commit/5f3c96c28503b8a0aad1514ef144b15e670d338b#diff-d08225593c57fc07ce549597f7fd4c68

Yep, this was pointed out by Jo as well, will change it.


> Ps.
>
> And are the drinks really back on the menu?

I think at least a vote was about to happen on this topic for the next 
release :)

-w-

Hi Jo,

On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:

> Hi,
>
> comments inline.
>
>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>
> Given the fact that we explicitely wanted to avoid @openwrt.org mails
> and that this was one of the discussion points leading to the split I
> find it delicate to seal the merging commit with exactly such a S-o-b.
>
> Combined with ...
>
>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>  Tue, 18 Oct 2016 11:42:06 +0200
>
> ... this looks to me like nothing was learned from past experiences and
> that all that matters here is having the own name attached to the work
> being done.

LEDE does have patches in the tree s-o-b-ed and accepted like this dated 
January '17. (f24ffb901e0408917748773b883841eca52eea05)

"*) email accounts
- currently there are around ~20 active openwrt.org mail accounts (the 3 owrt devs would like to keep theirs active)
- turn all the webmaster@, hostmaster@, ... accounts into aliases that anyone with voting rights can be subscribed to
- ask those people that are no longer active to voluntarily give up their accounts
- mail addresses may under no conditions be used for any personal business, consultancy, applying for jobs, ... purposes
- any mail sent from an openwrt.org account needs to adhere the trademark policy and should only be used for FOSS purposes"

In my view, this is FOSS purpose rather than anything else.


> Anyhow, on to the code.
>
>> diff --git a/Config.in b/Config.in
>> index ddbc4e2..d30c048 100644
>> --- a/Config.in
>> +++ b/Config.in
>
> [...]
>
>>  VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
>> -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.lede-project.org/snapshots)
>> +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots)
>
> We need to setup the server first or delegate downloads.openwrt.org to
> downloads.lede-project.org or add a rewrite rule to redirect
> http://downloads.openwrt.org/snapshots/(.*) to
> http://downloads.lede-project.org/snapshots/$1 for now.

Agreed, there are dependencies on the infrastructure side for this to be 
merged - or I'm OK to back it out until it's done. Having said that, this 
is easier to crack compared to the $LEDE_GIT source entries in the 
packages.


>>  VERSION_BUG_URL:=$(call qstrip_escape,$(CONFIG_VERSION_BUG_URL))
>> -VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.lede-project.org/)
>> +VERSION_BUG_URL:=$(if $(VERSION_BUG_URL),$(VERSION_BUG_URL),http://bugs.openwrt.org/)
>
> Likewise.

Likewise.

>>  VERSION_SUPPORT_URL:=$(call qstrip_escape,$(CONFIG_VERSION_SUPPORT_URL))
>> -VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.lede-project.org/)
>> +VERSION_SUPPORT_URL:=$(if $(VERSION_SUPPORT_URL),$(VERSION_SUPPORT_URL),http://forum.openwrt.org/)
>
> Undecided.

TBD.

>>  VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
>>  VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
>
> [...]
>
>> diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
>> index 4ec646a..af51b5a 100644
>> --- a/package/base-files/files/etc/banner
>> +++ b/package/base-files/files/etc/banner
>> @@ -1,10 +1,13 @@
>> -     _________
>> -    /        /\      _    ___ ___  ___
>> -   /  LE    /  \    | |  | __|   \| __|
>> -  /    DE  /    \   | |__| _|| |) | _|
>> - /________/  LE  \  |____|___|___/|___|                      lede-project.org
>> - \        \   DE /
>> -  \    LE  \    /  -----------------------------------------------------------
>> -   \  DE    \  /    %N (%V, %C)
>> -    \________\/    -----------------------------------------------------------
>> -
>> +  _______                     ________        __
>> + |       |.-----.-----.-----.|  |  |  |.----.|  |_
>> + |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
>> + |_______||   __|_____|__|__||________||__|  |____|
>> +          |__| W I R E L E S S   F R E E D O M
>> + -----------------------------------------------------
>> + DESIGNATED DRIVER (%C, %R)
>
> Please replace "DESIGNATED DRIVER" with "%N". "%V, %C" (17.01.4,
> r3560-79f57e422d) are more useful under the new version scheme than "%C,
> %R" (r3560-79f57e422d, r3560-79f57e422d)

Let's stash the "DESIGNATED DRIVER" until others reply. VERSION_NUMBER 
is currently SNAPSHOT - we should let others decide the cocktail part 
of it. :)


>> + -----------------------------------------------------
>> +  * 2 oz. Orange Juice         Combine all juices in a
>> +  * 2 oz. Pineapple Juice      tall glass filled with
>> +  * 2 oz. Grapefruit Juice     ice, stir well.
>> +  * 2 oz. Cranberry Juice
>> + -----------------------------------------------------
>> diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
>> index 8c5f677..54c0e3e 100755
>> --- a/package/base-files/files/etc/init.d/system
>> +++ b/package/base-files/files/etc/init.d/system
>> @@ -7,7 +7,7 @@ USE_PROCD=1
>>  validate_system_section()
>>  {
>>  	uci_validate_section system system "${1}" \
>> -		'hostname:string:lede' \
>> +		'hostname:string:openwrt' \
>
> While we're at it we should properly capitalize the default to "OpenWrt".

Sure, this was to follow the "lede" capitalization, happy to change.


>>  		'conloglevel:uinteger' \
>>  		'buffersize:uinteger' \
>>  		'timezone:string:UTC' \
>
> [...]
>
>> diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
>> index 6b8be1c..fd8365a 100755
>> --- a/package/network/services/uhttpd/files/uhttpd.init
>> +++ b/package/network/services/uhttpd/files/uhttpd.init
>> @@ -52,7 +52,7 @@ generate_keys() {
>>  	[ -n "$GENKEY_CMD" ] && {
>>  		$GENKEY_CMD \
>>  			-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
>> -			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-Lede}$UNIQUEID"/CN="${commonname:-Lede}"
>> +			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"
>
> Maybe we should adjust the defaults here to match the shipped config.
>
>>  		sync
>>  		mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
>>  		mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
>> diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
>> index 14a33c5..c9ef626 100644
>> --- a/package/network/utils/iproute2/Makefile
>> +++ b/package/network/utils/iproute2/Makefile
>> @@ -108,7 +108,7 @@ define Build/Configure
>>  		$(PKG_BUILD_DIR)/Makefile
>>  	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
>>  		$(PKG_BUILD_DIR)/Makefile
>> -	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-lede\";" \
>> +	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
>>  	> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
>>  endef
>>
>> diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
>> index 79059e5..2a8d9dd 100644
>> --- a/package/utils/busybox/Config-defaults.in
>> +++ b/package/utils/busybox/Config-defaults.in
>> @@ -2332,10 +2332,10 @@ config BUSYBOX_DEFAULT_FEATURE_NETSTAT_PRG
>>  config BUSYBOX_DEFAULT_NSLOOKUP
>>  	bool
>>  	default n
>> -config BUSYBOX_DEFAULT_NSLOOKUP_LEDE
>> +config BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
>
> Need to adjust the patch file accordingly.

Ack for all below, will do.


>>  	bool
>>  	default y
>> -config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
>> +config BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
>
> Dito.
>
>>  	bool
>>  	default n
>>  config BUSYBOX_DEFAULT_NTPD
>> diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
>> index 14875d5..2d2a1c4 100644
>> --- a/package/utils/busybox/config/networking/Config.in
>> +++ b/package/utils/busybox/config/networking/Config.in
>> @@ -700,17 +700,17 @@ config BUSYBOX_CONFIG_NSLOOKUP
>>  	default BUSYBOX_DEFAULT_NSLOOKUP
>>  	help
>>  	  nslookup is a tool to query Internet name servers.
>> -config BUSYBOX_CONFIG_NSLOOKUP_LEDE
>> +config BUSYBOX_CONFIG_NSLOOKUP_OPENWRT
>
> Dito.
>
>>  	bool "nslookup_lede"
>>  	depends on !BUSYBOX_CONFIG_NSLOOKUP
>> -	default BUSYBOX_DEFAULT_NSLOOKUP_LEDE
>> +	default BUSYBOX_DEFAULT_NSLOOKUP_OPENWRT
>
> Dito.
>
>>  	help
>> -	  nslookup is a tool to query Internet name servers (LEDE flavor).
>> +	  nslookup is a tool to query Internet name servers (OpenWrt flavor).
>>
>> -config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
>> +config BUSYBOX_CONFIG_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
>
> Dito.
>
>>         bool "Enable long options"
>> -       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_LEDE_LONG_OPTIONS
>> -       depends on BUSYBOX_CONFIG_NSLOOKUP_LEDE && BUSYBOX_CONFIG_LONG_OPTS
>> +       default BUSYBOX_DEFAULT_FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
>> +       depends on BUSYBOX_CONFIG_NSLOOKUP_OPENWRT && BUSYBOX_CONFIG_LONG_OPTS
>>         help
>>           Support long options for the nslookup applet.
>>  config BUSYBOX_CONFIG_NTPD
>
> [...]
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
>

2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
> Hi Jo,
>
> On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:
>
>> Hi,
>>
>> comments inline.
>>
>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>
>>
>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>> and that this was one of the discussion points leading to the split I
>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>
>> Combined with ...
>>
>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>  Tue, 18 Oct 2016 11:42:06 +0200
>>
>> ... this looks to me like nothing was learned from past experiences and
>> that all that matters here is having the own name attached to the work
>> being done.
>
>
> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>
> "*) email accounts
> - currently there are around ~20 active openwrt.org mail accounts (the 3
> owrt devs would like to keep theirs active)
> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
> anyone with voting rights can be subscribed to
> - ask those people that are no longer active to voluntarily give up their
> accounts
> - mail addresses may under no conditions be used for any personal business,
> consultancy, applying for jobs, ... purposes
> - any mail sent from an openwrt.org account needs to adhere the trademark
> policy and should only be used for FOSS purposes"
>
> In my view, this is FOSS purpose rather than anything else.

Can't we just find some kind of gentleman/ladies agreement to not use
the mail addresses in public? I mean, I never got why these three
people insists on using their mail addresses for anything other than
receiving mail/as a forwarder.

As soon as someone starts to use a @openwrt.org mail address,
basically all other are forced to do so as well. Otherwise the way it
comes across is N @openwrt.org core devs + X people committing as
well. Which I'm quite sure is what nobody wants to see.

my two cents
Mathias

On Tue, Oct 24, 2017 at 7:17 PM, Mathias Kresin <dev@kresin.me> wrote:
> 2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
>> Hi Jo,
>>
>> On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:
>>
>>> Hi,
>>>
>>> comments inline.
>>>
>>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>>
>>>
>>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>>> and that this was one of the discussion points leading to the split I
>>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>>
>>> Combined with ...
>>>
>>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>>  Tue, 18 Oct 2016 11:42:06 +0200
>>>
>>> ... this looks to me like nothing was learned from past experiences and
>>> that all that matters here is having the own name attached to the work
>>> being done.
>>
>>
>> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
>> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>>
>> "*) email accounts
>> - currently there are around ~20 active openwrt.org mail accounts (the 3
>> owrt devs would like to keep theirs active)
>> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
>> anyone with voting rights can be subscribed to
>> - ask those people that are no longer active to voluntarily give up their
>> accounts
>> - mail addresses may under no conditions be used for any personal business,
>> consultancy, applying for jobs, ... purposes
>> - any mail sent from an openwrt.org account needs to adhere the trademark
>> policy and should only be used for FOSS purposes"
>>
>> In my view, this is FOSS purpose rather than anything else.
>
> Can't we just find some kind of gentleman/ladies agreement to not use
> the mail addresses in public? I mean, I never got why these three
> people insists on using their mail addresses for anything other than
> receiving mail/as a forwarder.
>
> As soon as someone starts to use a @openwrt.org mail address,
> basically all other are forced to do so as well. Otherwise the way it
> comes across is N @openwrt.org core devs + X people committing as
> well. Which I'm quite sure is what nobody wants to see.
>
> my two cents
> Mathias
I agree with Mathias can't we find a better consensus on the usage of
the openwrt mail address ?
Now it looks like 3 people officially represent the project next to
the other developers; this will only cause friction in the future.

Hans

> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

On 10/24/2017 09:47 PM, Hans Dedecker wrote:
> On Tue, Oct 24, 2017 at 7:17 PM, Mathias Kresin <dev@kresin.me> wrote:
>> 2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
>>> Hi Jo,
>>>
>>> On Tue, 24 Oct 2017, Jo-Philipp Wich wrote:
>>>
>>>> Hi,
>>>>
>>>> comments inline.
>>>>
>>>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>>>
>>>>
>>>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>>>> and that this was one of the discussion points leading to the split I
>>>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>>>
>>>> Combined with ...
>>>>
>>>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>>>  Tue, 18 Oct 2016 11:42:06 +0200
>>>>
>>>> ... this looks to me like nothing was learned from past experiences and
>>>> that all that matters here is having the own name attached to the work
>>>> being done.
>>>
>>>
>>> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
>>> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>>>
>>> "*) email accounts
>>> - currently there are around ~20 active openwrt.org mail accounts (the 3
>>> owrt devs would like to keep theirs active)
>>> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
>>> anyone with voting rights can be subscribed to
>>> - ask those people that are no longer active to voluntarily give up their
>>> accounts
>>> - mail addresses may under no conditions be used for any personal business,
>>> consultancy, applying for jobs, ... purposes
>>> - any mail sent from an openwrt.org account needs to adhere the trademark
>>> policy and should only be used for FOSS purposes"
>>>
>>> In my view, this is FOSS purpose rather than anything else.
>>
>> Can't we just find some kind of gentleman/ladies agreement to not use
>> the mail addresses in public? I mean, I never got why these three
>> people insists on using their mail addresses for anything other than
>> receiving mail/as a forwarder.
>>
>> As soon as someone starts to use a @openwrt.org mail address,
>> basically all other are forced to do so as well. Otherwise the way it
>> comes across is N @openwrt.org core devs + X people committing as
>> well. Which I'm quite sure is what nobody wants to see.
>>
>> my two cents
>> Mathias
> I agree with Mathias can't we find a better consensus on the usage of
> the openwrt mail address ?
> Now it looks like 3 people officially represent the project next to
> the other developers; this will only cause friction in the future.
> 
> Hans

I agree with Mathias and Hans, I also do not like this and this looks
like some are more equal than others to outsiders.

I have no problem when the mails are getting forward to the old user of
the address, so that people who send a mail to some @openwrt.org address
still reach the correct person, this can also stay activate forever when
someone wants to maintain the service. The @openwrt.org addresses should
not be used in communication, especially when it is related to OpenWrt,
this includes S-o-b lines, copyright lines and outgoing communication.

Hauke

Hi Hauke,

On Tue, 24 Oct 2017, Hauke Mehrtens wrote:

> On 10/24/2017 09:47 PM, Hans Dedecker wrote:
>> On Tue, Oct 24, 2017 at 7:17 PM, Mathias Kresin <dev@kresin.me> wrote:
>>> 2017-10-24 16:59 GMT+02:00 Zoltan HERPAI <wigyori@uid0.hu>:
>>>>>
>>>>>> Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
>>>>>
>>>>> Given the fact that we explicitely wanted to avoid @openwrt.org mails
>>>>> and that this was one of the discussion points leading to the split I
>>>>> find it delicate to seal the merging commit with exactly such a S-o-b.
>>>>>
>>>>> Combined with ...
>>>>>
>>>>>  $ git log --author "Imre Kaloz <kaloz@openwrt.org>" --format=%cD -1
>>>>>  Tue, 18 Oct 2016 11:42:06 +0200
>>>>>
>>>>> ... this looks to me like nothing was learned from past experiences and
>>>>> that all that matters here is having the own name attached to the work
>>>>> being done.
>>>>
>>>>
>>>> LEDE does have patches in the tree s-o-b-ed and accepted like this dated
>>>> January '17. (f24ffb901e0408917748773b883841eca52eea05)
>>>>
>>>> "*) email accounts
>>>> - currently there are around ~20 active openwrt.org mail accounts (the 3
>>>> owrt devs would like to keep theirs active)
>>>> - turn all the webmaster@, hostmaster@, ... accounts into aliases that
>>>> anyone with voting rights can be subscribed to
>>>> - ask those people that are no longer active to voluntarily give up their
>>>> accounts
>>>> - mail addresses may under no conditions be used for any personal business,
>>>> consultancy, applying for jobs, ... purposes
>>>> - any mail sent from an openwrt.org account needs to adhere the trademark
>>>> policy and should only be used for FOSS purposes"
>>>>
>>>> In my view, this is FOSS purpose rather than anything else.
>>>
>>> Can't we just find some kind of gentleman/ladies agreement to not use
>>> the mail addresses in public? I mean, I never got why these three
>>> people insists on using their mail addresses for anything other than
>>> receiving mail/as a forwarder.
>>>
>>> As soon as someone starts to use a @openwrt.org mail address,
>>> basically all other are forced to do so as well. Otherwise the way it
>>> comes across is N @openwrt.org core devs + X people committing as
>>> well. Which I'm quite sure is what nobody wants to see.
>>>
>>> my two cents
>>> Mathias
>> I agree with Mathias can't we find a better consensus on the usage of
>> the openwrt mail address ?
>> Now it looks like 3 people officially represent the project next to
>> the other developers; this will only cause friction in the future.
>>
>> Hans
>
> I agree with Mathias and Hans, I also do not like this and this looks
> like some are more equal than others to outsiders.
>
> I have no problem when the mails are getting forward to the old user of
> the address, so that people who send a mail to some @openwrt.org address
> still reach the correct person, this can also stay activate forever when
> someone wants to maintain the service. The @openwrt.org addresses should
> not be used in communication, especially when it is related to OpenWrt,
> this includes S-o-b lines, copyright lines and outgoing communication.

Getting a consensus is one thing, arguing against what was voted on is 
another. I don't think that anyone wants to misrepresent the project or 
cause friction of any kind - such behaviour would be beyond 
professionalism, and these things were discussed in detail in the remerge 
proposals -, especially when the Reboot has achieved a lot of things, and 
we should look into the future.

Having said all that, currently I can only create a v2 of this patch with 
the fixes asked/proposed.

Regards,
-w-

Zoltan HERPAI <wigyori@uid0.hu> wrote:
> Given that we've decided to sail under the same flag for the
> benefit of the whole community, and acknowledge the
> achievements of the LEDE project, let's start the final steps
> of the merge.
>     
> The git and other sources are untouched until the infra merge.
>     


I'd like to leave Designated Driver as the period of time for
OpenWrt's trunk branch before LEDE, and have "something
different" for the new path going forward. The YY.MM naming is
boring, but functional. Alphabetical names are fine too, but I
don't think it should go back to the old name.

Sincerely,
Karl P