sync with 2.4 icu.

1. update AmPm string using latest icu data(v55)
2. Apply ASLR(pie option)
3. version name change to 54.1

Change-Id: I970159cdf5c7796af20a026226e0074b3748337d
Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>

diff --git a/packaging/icu.spec b/packaging/icu.spec
index 64f4c65..c315ff5 100644 (file)
--- a/packaging/icu.spec
+++ b/packaging/icu.spec
@@ -1,11 +1,11 @@
 Name:      icu
-Version:   51.1
+Version:   54.1
 Release:   1
 Summary:   International Components for Unicode
 Group:     System/Libraries
 License:   ICU
 URL:       http://www.icu-project.org/
-%define tar_version 51_1
+%define tar_version 54_1
 Source0:   %{name}4c-%{tar_version}-src.tgz
 Source1001:    icu.manifest
 BuildRequires: doxygen

diff --git a/source/data/locales/en_GB.txt b/source/data/locales/en_GB.txt
index d8cd1b4..51d2c0d 100644 (file)
--- a/source/data/locales/en_GB.txt
+++ b/source/data/locales/en_GB.txt
@@ -313,8 +313,8 @@ en_GB{
         }\r
         gregorian{\r
             AmPmMarkers{\r
-                "am",\r
-                "pm",\r
+                "a.m.",\r
+                "p.m.",\r
             }\r
             DateTimePatterns{\r
                 "HH:mm:ss zzzz",\r
@@ -706,7 +706,7 @@ en_GB{
             }\r
         }\r
         dayperiod{\r
-            dn{"am/pm"}\r
+            dn{"a.m./p.m."}\r
         }\r
         hour-narrow{\r
             dn{"h"}\r

diff --git a/source/extra/uconv/Makefile.in b/source/extra/uconv/Makefile.in
index e8cd6cf..1b9d217 100644 (file)
--- a/source/extra/uconv/Makefile.in
+++ b/source/extra/uconv/Makefile.in
@@ -42,8 +42,9 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
+LDFLAGS += -pie
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 ifeq ($(PKGDATA_OPTS),)
@@ -145,6 +146,9 @@ $(TARGET) : $(OBJECTS)  $(UCONVMSG_LIB)
        $(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS)
        $(POST_BUILD_STEP)
 
+uconv.o: uconv.cpp
+       $(LINK.cc) $(CPPFLAGS) -c uconv.cpp $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS)
+
 # The | is an order-only prerequisite. This helps when the -j option is used,
 # and we don't want the files to be built before the directories are built.
 ifneq ($(filter order-only,$(.FEATURES)),)

diff --git a/source/tools/genbrk/Makefile.in b/source/tools/genbrk/Makefile.in
index 77182d1..cf3c024 100644 (file)
--- a/source/tools/genbrk/Makefile.in
+++ b/source/tools/genbrk/Makefile.in
@@ -26,7 +26,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = genbrk.o
@@ -77,6 +78,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+genbrk.o: genbrk.cpp
+       $(LINK.cc) $(CPPFLAGS) -c genbrk.cpp $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/genccode/Makefile.in b/source/tools/genccode/Makefile.in
index fe6b60f..440a35a 100644 (file)
--- a/source/tools/genccode/Makefile.in
+++ b/source/tools/genccode/Makefile.in
@@ -27,7 +27,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = genccode.o
@@ -78,6 +79,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+genccode.o: genccode.c
+       $(LINK.cc) $(CPPFLAGS) -c genccode.c $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/gencfu/Makefile.in b/source/tools/gencfu/Makefile.in
index 98ea0f0..1212b44 100644 (file)
--- a/source/tools/gencfu/Makefile.in
+++ b/source/tools/gencfu/Makefile.in
@@ -26,7 +26,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gencfu.o
@@ -77,6 +78,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+gencfu.o: gencfu.cpp
+       $(LINK.cc) $(CPPFLAGS) -c gencfu.cpp $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/gencmn/Makefile.in b/source/tools/gencmn/Makefile.in
index 8a758d1..01cd40d 100644 (file)
--- a/source/tools/gencmn/Makefile.in
+++ b/source/tools/gencmn/Makefile.in
@@ -27,7 +27,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gencmn.o
@@ -78,6 +79,9 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+gencmn.o: gencmn.c
+       $(LINK.cc) $(CPPFLAGS) -c gencmn.c $(LIBS)
+
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \
         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

diff --git a/source/tools/gencnval/Makefile.in b/source/tools/gencnval/Makefile.in
index 985f1e3..9a5a538 100644 (file)
--- a/source/tools/gencnval/Makefile.in
+++ b/source/tools/gencnval/Makefile.in
@@ -27,7 +27,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gencnval.o
@@ -78,6 +79,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+gencnval.o: gencnval.c
+       gcc $(CPPFLAGS) -c gencnval.c $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/gendict/Makefile.in b/source/tools/gendict/Makefile.in
index f5ee617..a039eb7 100644 (file)
--- a/source/tools/gendict/Makefile.in
+++ b/source/tools/gendict/Makefile.in
@@ -26,7 +26,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gendict.o
@@ -77,6 +78,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+gendict.o: gendict.cpp
+       $(LINK.cc) $(CPPFLAGS) -c gendict.cpp $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/gennorm2/Makefile.in b/source/tools/gennorm2/Makefile.in
index b8f926a..81e67b2 100644 (file)
--- a/source/tools/gennorm2/Makefile.in
+++ b/source/tools/gennorm2/Makefile.in
@@ -22,7 +22,8 @@ CLEANFILES = *~ $(DEPS)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gennorm2.o n2builder.o
@@ -69,6 +70,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+gennorm2.o: gennorm2.cpp
+       $(LINK.cc) $(CPPFLAGS) -c gennorm2.cpp $(LIBS)
 
 ifeq (,$(MAKECMDGOALS))
 -include $(DEPS)

diff --git a/source/tools/genrb/Makefile.in b/source/tools/genrb/Makefile.in
index 8615199..8e2fb4e 100644 (file)
--- a/source/tools/genrb/Makefile.in
+++ b/source/tools/genrb/Makefile.in
@@ -31,8 +31,9 @@ TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 # derb depends on icuio
 @ICUIO_TRUE@DERB = $(BINDIR)/$(DERB_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil -I$(top_srcdir)/io
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil -I$(top_srcdir)/io
 CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o rbutil.o \
@@ -89,10 +90,16 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+genrb.o: genrb.c
+       gcc $(CPPFLAGS) -c genrb.c $(LIBS)
+
 $(DERB) : $(DERB_OBJ)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBICUIO) $(LIBS)
        $(POST_BUILD_STEP)
 
+derb.o: derb.c
+       gcc $(CPPFLAGS) -c derb.c $(LIBS)
+
 # This line is needed to serialize builds when the gmake -j option is used.
 $(TARGET_STUB_NAME).$(SECTION): $(DERB_STUB_NAME).$(SECTION)
 

diff --git a/source/tools/gensprep/Makefile.in b/source/tools/gensprep/Makefile.in
index 4da97bd..e3c1d1d 100644 (file)
--- a/source/tools/gensprep/Makefile.in
+++ b/source/tools/gensprep/Makefile.in
@@ -27,7 +27,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = gensprep.o store.o
@@ -78,6 +79,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) 
        $(POST_BUILD_STEP)
 
+gensprep.o: gensprep.c
+       $(LINK.cc) $(CPPFLAGS) -c gensprep.c $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/icuinfo/Makefile.in b/source/tools/icuinfo/Makefile.in
index 89c0b74..0d151cd 100644 (file)
--- a/source/tools/icuinfo/Makefile.in
+++ b/source/tools/icuinfo/Makefile.in
@@ -21,7 +21,8 @@ CLEANFILES = *~ $(DEPS) $(PLUGIN_OBJECTS) $(PLUGINFILE) $(PLUGIN)
 TARGET = icuinfo$(EXEEXT)
 
 CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil -I$(top_srcdir)/tools/ctestfw 
-CPPFLAGS+= -I$(top_srcdir)/i18n
+CPPFLAGS+= -fPIE -I$(top_srcdir)/i18n
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = icuinfo.o
@@ -75,6 +76,9 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) 
        $(POST_BUILD_STEP)
 
+icuinfo.o: icuinfo.cpp
+       $(LINK.cc) $(CPPFLAGS) -c icuinfo.cpp $(LIBS)
+
 PLUGIN=$(LIBPREFIX)plugin.$(SO)
 SO_TARGET=$(PLUGIN)
 

diff --git a/source/tools/icupkg/Makefile.in b/source/tools/icupkg/Makefile.in
index a8cd5a4..d1975e3 100644 (file)
--- a/source/tools/icupkg/Makefile.in
+++ b/source/tools/icupkg/Makefile.in
@@ -26,7 +26,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = icupkg.o
@@ -78,6 +79,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+icupkg.o: icupkg.cpp
+       $(LINK.cc) $(CPPFLAGS) -c icupkg.cpp $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/makeconv/Makefile.in b/source/tools/makeconv/Makefile.in
index f0659e0..aa7a6f6 100644 (file)
--- a/source/tools/makeconv/Makefile.in
+++ b/source/tools/makeconv/Makefile.in
@@ -26,7 +26,8 @@ CLEANFILES = *~ $(DEPS) $(MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
 OBJECTS = makeconv.o ucnvstat.o genmbcs.o gencnvex.o
@@ -78,6 +79,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+makeconv.o: makeconv.c
+       $(LINK.cc) $(CPPFLAGS) -c makeconv.c $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \

diff --git a/source/tools/pkgdata/Makefile.in b/source/tools/pkgdata/Makefile.in
index 04fe636..f77c1cd 100644 (file)
--- a/source/tools/pkgdata/Makefile.in
+++ b/source/tools/pkgdata/Makefile.in
@@ -30,7 +30,8 @@ endif
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)
 
-CPPFLAGS += -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+CPPFLAGS += -fPIE -I$(top_srcdir)/common -I$(srcdir)/../toolutil
+LDFLAGS += -pie
 DEFS += -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\"
 LIBS = $(LIBICUTOOLUTIL) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
 
@@ -83,6 +84,8 @@ $(TARGET) : $(OBJECTS)
        $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
        $(POST_BUILD_STEP)
 
+pkgdata.o: pkgdata.cpp
+       $(LINK.cc) $(CPPFLAGS) -c pkgdata.cpp $(LIBS)
 
 %.$(SECTION): $(srcdir)/%.$(SECTION).in
        cd $(top_builddir) \