[COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[TAMUKI Shoichi]

The offset in era-string format for Taisho gan-nen (1912) is currently
defined as 2, but it should be 1.  So fix it.  "Gan-nen" means the 1st
(origin) year, Taisho started on July 30, 1912.

Reported-by: Morimitsu, Junji <junji.morimitsu@hpe.com>
Reviewed-by: Rafal Luzynski <digitalfreak@lingonborough.com>

ChangeLog:

	[BZ #24162]
	* localedata/locales/ja_JP (LC_TIME): Change the offset for Taisho
	gan-nen from 2 to 1.  Problem reported by Morimitsu, Junji.
---
 localedata/locales/ja_JP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index 1fd2fee..9bfbb2b 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -14951,7 +14951,7 @@ era	"+:2:1990//01//01:+*:<U5E73><U6210>:%EC%Ey<U5E74>";/
 	"+:2:1927//01//01:1989//01//07:<U662D><U548C>:%EC%Ey<U5E74>";/
 	"+:1:1926//12//25:1926//12//31:<U662D><U548C>:%EC<U5143><U5E74>";/
 	"+:2:1913//01//01:1926//12//24:<U5927><U6B63>:%EC%Ey<U5E74>";/
-	"+:2:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/
+	"+:1:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/
 	"+:6:1873//01//01:1912//07//29:<U660E><U6CBB>:%EC%Ey<U5E74>";/
 	"+:1:0001//01//01:1872//12//31:<U897F><U66A6>:%EC%Ey<U5E74>";/
 	"+:1:-0001//12//31:-*:<U7D00><U5143><U524D>:%EC%Ey<U5E74>"
-- 
2.2.1

Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[Rafal Luzynski]

Thank you for your contribution, TAMUKI-san.  You don't need to post
the patch again if you commit the same patch which had been posted
before, or if changes are minor.  Also, if you remove ChangeLog from
your patch before posting then you don't have to remove it if the
patch is committed.

Otherwise perfect.

Regards,

Rafal

Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[Rafal Luzynski]

TAMUKI-san,

Do you consider backporting this patch to 2.29?  Do you need an
assistance or do you need someone to backport this for you?
No problem if you don't want this to be backported.

See also: https://sourceware.org/ml/libc-alpha/2019-02/msg00558.html

Regards,

Rafal


2.03.2019 13:25 TAMUKI Shoichi <tamuki@linet.gr.jp> wrote:
> 
> 
> The offset in era-string format for Taisho gan-nen (1912) is currently
> defined as 2, but it should be 1.  So fix it.  "Gan-nen" means the 1st
> (origin) year, Taisho started on July 30, 1912.
> 
> Reported-by: Morimitsu, Junji <junji.morimitsu@hpe.com>
> Reviewed-by: Rafal Luzynski <digitalfreak@lingonborough.com>
> 
> ChangeLog:
> 
> 	[BZ #24162]
> 	* localedata/locales/ja_JP (LC_TIME): Change the offset for Taisho
> 	gan-nen from 2 to 1.  Problem reported by Morimitsu, Junji.
> ---
>  localedata/locales/ja_JP | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
> index 1fd2fee..9bfbb2b 100644
> --- a/localedata/locales/ja_JP
> +++ b/localedata/locales/ja_JP
> @@ -14951,7 +14951,7 @@ era
> "+:2:1990//01//01:+*:<U5E73><U6210>:%EC%Ey<U5E74>";/
>  	"+:2:1927//01//01:1989//01//07:<U662D><U548C>:%EC%Ey<U5E74>";/
>  	"+:1:1926//12//25:1926//12//31:<U662D><U548C>:%EC<U5143><U5E74>";/
>  	"+:2:1913//01//01:1926//12//24:<U5927><U6B63>:%EC%Ey<U5E74>";/
> -	"+:2:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/
> +	"+:1:1912//07//30:1912//12//31:<U5927><U6B63>:%EC<U5143><U5E74>";/
>  	"+:6:1873//01//01:1912//07//29:<U660E><U6CBB>:%EC%Ey<U5E74>";/
>  	"+:1:0001//01//01:1872//12//31:<U897F><U66A6>:%EC%Ey<U5E74>";/
>  	"+:1:-0001//12//31:-*:<U7D00><U5143><U524D>:%EC%Ey<U5E74>"
> -- 
> 2.2.1

Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[TAMUKI Shoichi]

Hello Rafal-san,

From: Rafal Luzynski <digitalfreak@lingonborough.com>
Subject: Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]
Date: Fri, 15 Mar 2019 08:56:25 +0100 (CET)

> Do you consider backporting this patch to 2.29?  Do you need an
> assistance or do you need someone to backport this for you?
> No problem if you don't want this to be backported.
> 
> See also: https://sourceware.org/ml/libc-alpha/2019-02/msg00558.html

Yes, I remember the work remaining to backport this patch to 2.29.

From: Rafal Luzynski <digitalfreak@lingonborough.com>
Subject: Re: [PATCH] ja_JP locale: Fix the offset in era-string for Taisho gan-nen [BZ #24162]
Date: Sat, 23 Feb 2019 14:15:20 +0100 (CET)

> > As you are discussing here backporting, I think it is better to
> > backport to 2.29 only.
> 
> Yes, we have all agreed on this.
> 
> Please see how other backported patches look and format yours the same.
> Hint 1: use "git cherry-pick -x" to copy your commit from master to your
> local copy of 2.29 branch.

I have little experience with git cherry-pick, so I am a little
hesitated to do it.  But I will try it anyway.

> Hint 2: You should update NEWS file in the
> branch manually.  Yes, lots of people forget it but please do it.

I saw some commits already backported on 2.29 branch.  Perhaps, I
should add one line to NEWS file as follows.

| Version 2.29.1
| 
| The following bugs are resolved with this release:
| 
|   [24155] x32 memcmp can treat positive length as 0 (if sign bit in RDX is set) (CVE-2019-7309)
|   [24164] Systemtap probes need to use "nr" constraint on 32-bit Arm
|   [24161] __run_fork_handlers self-deadlocks in malloc/tst-mallocfork2
|   [24211] Use-after-free in Systemtap probe in pthread_join
|   [24162] ja_JP LC_TIME: era offset for Taisho GanNen

> Hint 3: Most likely you will have a conflict in the ChangeLog, you
> will have to resolve it manually.

Hmm, I will try it anyway.

By the way, is there a plan to release 2.29.1?

Regrads,
TAMUKI Shoichi

Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[Rafal Luzynski]

16.03.2019 14:07 TAMUKI Shoichi <tamuki@linet.gr.jp> wrote:
> 
> Hello Rafal-san,
> 
> From: Rafal Luzynski <digitalfreak@lingonborough.com>
> Subject: Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from
> 2 to 1 [BZ #24162]
> Date: Fri, 15 Mar 2019 08:56:25 +0100 (CET)
> 
> > Do you consider backporting this patch to 2.29?  Do you need an
> > assistance or do you need someone to backport this for you?
> > No problem if you don't want this to be backported.
> > 
> > See also: https://sourceware.org/ml/libc-alpha/2019-02/msg00558.html
> 
> Yes, I remember the work remaining to backport this patch to 2.29.

OK, nice.

> > [...]
> > Please see how other backported patches look and format yours the same.
> > Hint 1: use "git cherry-pick -x" to copy your commit from master to your
> > local copy of 2.29 branch.
> 
> I have little experience with git cherry-pick, so I am a little
> hesitated to do it.  But I will try it anyway.

Nothing wrong may happen until you do git push.  (This sentence should
not stop you from git push anyway.)  Remember, you will be pushing to
2.29 branch, not master.

I've just learned recently about this document which will help you:
https://sourceware.org/glibc/wiki/GlibcGit#Cherry_Pick_Changes_From_Another_Branch

> > Hint 2: You should update NEWS file in the
> > branch manually.  Yes, lots of people forget it but please do it.
> 
> I saw some commits already backported on 2.29 branch.  Perhaps, I
> should add one line to NEWS file as follows.
> 
> [...]

You should mark the bug as Resolved/Fixed and set the Target Milestone
to 2.30 first.  Then you can run the script:

  $ ./scripts/list-fixed-bugs.py 2.30

which will list the NEWS for 2.30 release.  You will be able to find the
line which applies to your bug and copy it.

But now I can see that this bug is only half-fixed because it mentions the
BC direction as well.  No reason to mention it as fixed in NEWS then.
Whether to backport the patch it's up to you, my suggestion is yes,
backport.

> > Hint 3: Most likely you will have a conflict in the ChangeLog, you
> > will have to resolve it manually.
> 
> Hmm, I will try it anyway.

The link above will help you.

> By the way, is there a plan to release 2.29.1?

I asked a similar question before and the answer (if I remember correctly)
was: no, but distros are free to apply the upstream patches, and some of
them (e.g., Fedora) do this regularly.

Regards,

Rafal

Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[TAMUKI Shoichi]

Hello Rafal-san,

From: Rafal Luzynski <digitalfreak@lingonborough.com>
Subject: Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]
Date: Wed, 20 Mar 2019 23:08:23 +0100 (CET)

> > Yes, I remember the work remaining to backport this patch to 2.29.
> 
> OK, nice.

I have done git push to 2.29 branch.

https://sourceware.org/bugzilla/show_bug.cgi?id=24162#c10

> But now I can see that this bug is only half-fixed because it mentions the
> BC direction as well.  No reason to mention it as fixed in NEWS then.
> Whether to backport the patch it's up to you, my suggestion is yes,
> backport.

OK.  So, I did not update NEWS file this time.

* Note to self: Steps to backport from master to 2.29

git fetch origin release/2.29/master
git checkout release/2.29/master
git cherry-pick -x 31effac
cat << "EOF" | patch ChangeLog
1,3d0
< <<<<<<< HEAD
< 2019-03-21  Stefan Liebler  <stli@linux.ibm.com>
< =======
10,11c7
< 2019-03-01  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
< >>>>>>> 31effacee2... ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]
---
> 2019-03-21  Stefan Liebler  <stli@linux.ibm.com>
EOF
git add ChangeLog
git cherry-pick --continue
git push origin release/2.29/master

> > By the way, is there a plan to release 2.29.1?
> 
> I asked a similar question before and the answer (if I remember correctly)
> was: no, but distros are free to apply the upstream patches, and some of
> them (e.g., Fedora) do this regularly.

Thank you for your explanation.  Understood.

Regards,
TAMUKI Shoichi

Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[Rafal Luzynski]

22.03.2019 04:40 TAMUKI Shoichi <tamuki@linet.gr.jp> wrote:
> 
> Hello Rafal-san,
> 
> From: Rafal Luzynski <digitalfreak@lingonborough.com>
> Subject: Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from
> 2 to 1 [BZ #24162]
> Date: Wed, 20 Mar 2019 23:08:23 +0100 (CET)
> 
> > > Yes, I remember the work remaining to backport this patch to 2.29.
> > 
> > OK, nice.
> 
> I have done git push to 2.29 branch.
> 
> https://sourceware.org/bugzilla/show_bug.cgi?id=24162#c10
> [...]

LGTM, thank you.

> [...]
> * Note to self: Steps to backport from master to 2.29
> 
> git fetch origin release/2.29/master
> git checkout release/2.29/master
> git cherry-pick -x 31effac
> cat << "EOF" | patch ChangeLog
> 1,3d0
> < <<<<<<< HEAD
> < 2019-03-21  Stefan Liebler  <stli@linux.ibm.com>
> < =======
> 10,11c7
> < 2019-03-01  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
> < >>>>>>> 31effacee2... ja_JP: Change the offset for Taisho gan-nen from 2
> to 1 [BZ #24162]
> ---
> > 2019-03-21  Stefan Liebler  <stli@linux.ibm.com>
> EOF
> git add ChangeLog
> git cherry-pick --continue
> git push origin release/2.29/master

Looks good.  You forgot about two important things:

1. git format-patch HEAD^..HEAD

and then send the output to libc-stable@sourceware.org with the subject
line starting with "[COMMITTED 2.29]"

2. git checkout master

for your own security, to make sure you don't push future commits to
2.29 accidentally.

Regards,

Rafal

Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[TAMUKI Shoichi]

Hello Rafal-san,

From: Rafal Luzynski <digitalfreak@lingonborough.com>
Subject: Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]
Date: Fri, 22 Mar 2019 23:21:57 +0100 (CET)

> Looks good.  You forgot about two important things:
> 
> 1. git format-patch HEAD^..HEAD
> 
> and then send the output to libc-stable@sourceware.org with the subject
> line starting with "[COMMITTED 2.29]"

Ah, I forgot to do it.  Done.

> 2. git checkout master
> 
> for your own security, to make sure you don't push future commits to
> 2.29 accidentally.

Sure.  Thank you.

Regards,
TAMUKI Shoichi