lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

Update tzcode from upstream git and support --with-bugurl for it.

Browse Source
This commit is contained in:
Joseph Myers
2012-11-13 22:25:45 +00:00
parent 8ca8931812
commit e27d476a65
5 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,5 +1,14 @@
2012-11-13 Joseph Myers <joseph@codesourcery.com> 2012-11-13 Joseph Myers <joseph@codesourcery.com>
* timezone/tzselect.ksh: Update from tzcode git revision
a435f9f0ecafa56d9e0263835836bd0c64cd7307.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.
* timezone/Makefile ($(objpfx)version.h): Only include $(version)
in TZVERSION setting, not $(PKGVERSION).
($(objpfx)tzselect): Likewise. Also substitute PKGVERSION and
REPORT_BUGS_TO settings.
[BZ #14838] [BZ #14838]
* resolv/netdb.h [__USE_XOPEN_EXTENDED] (IPPORT_RESERVED): Define * resolv/netdb.h [__USE_XOPEN_EXTENDED] (IPPORT_RESERVED): Define
macro. macro.

6
timezone/Makefile
View File

@@ -57,7 +57,7 @@ $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
$(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h $(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h
$(objpfx)version.h: $(common-objpfx)config.make $(objpfx)version.h: $(common-objpfx)config.make
echo 'static char const TZVERSION[]="$(PKGVERSION)$(version)";' \ echo 'static char const TZVERSION[]="$(version)";' \
> $@.new > $@.new
mv -f $@.new $@ mv -f $@.new $@
@@ -115,7 +115,9 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
sed -e 's|/bin/bash|$(KSH)|g' \ sed -e 's|/bin/bash|$(KSH)|g' \
-e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \ -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-e '/TZVERSION=/s|see_Makefile|"$(PKGVERSION)$(version)"|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
-e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
-e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
< $< > $@.new < $< > $@.new
chmod 555 $@.new chmod 555 $@.new
mv -f $@.new $@ mv -f $@.new $@

10
timezone/tzselect.ksh
View File

@@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
PKGVERSION='(tzcode) '
TZVERSION=see_Makefile TZVERSION=see_Makefile
REPORT_BUGS_TO=tz@iana.org
# Ask the user about the time zone, and output the resulting TZ value to stdout. # Ask the user about the time zone, and output the resulting TZ value to stdout.
# Interact with the user via stderr and stdin. # Interact with the user via stderr and stdin.
@@ -43,14 +45,14 @@ if [ "$1" = "--help" ]; then
Usage: tzselect Usage: tzselect
Select a time zone interactively. Select a time zone interactively.
Report bugs to tz@elsie.nci.nih.gov. Report bugs to $REPORT_BUGS_TO.
EOF EOF
exit 0 exit
elif [ "$1" = "--version" ]; then elif [ "$1" = "--version" ]; then
cat <<EOF cat <<EOF
tzselect $TZVERSION tzselect $PKGVERSION$TZVERSION
EOF EOF
exit 0 exit
fi fi
# Make sure the tables are readable. # Make sure the tables are readable.

6
timezone/zdump.c
View File

@@ -272,8 +272,8 @@ usage(FILE * const stream, const int status)
(void) fprintf(stream, (void) fprintf(stream,
_("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\ _("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\
\n\ \n\
Report bugs to tz@elsie.nci.nih.gov.\n"), Report bugs to %s.\n"),
progname, progname); progname, progname, REPORT_BUGS_TO);
exit(status); exit(status);
} }
@@ -309,7 +309,7 @@ main(int argc, char *argv[])
progname = argv[0]; progname = argv[0];
for (i = 1; i < argc; ++i) for (i = 1; i < argc; ++i)
if (strcmp(argv[i], "--version") == 0) { if (strcmp(argv[i], "--version") == 0) {
(void) printf("%s\n", TZVERSION); (void) printf("zdump %s%s\n", PKGVERSION, TZVERSION);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if (strcmp(argv[i], "--help") == 0) { } else if (strcmp(argv[i], "--help") == 0) {
usage(stdout, EXIT_SUCCESS); usage(stdout, EXIT_SUCCESS);

10
timezone/zic.c
View File

@@ -426,8 +426,8 @@ usage(FILE *stream, int status)
[ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\ [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\
\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\ \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\
\n\ \n\
Report bugs to tz@elsie.nci.nih.gov.\n"), Report bugs to %s.\n"),
progname, progname); progname, progname, REPORT_BUGS_TO);
exit(status); exit(status);
} }
@@ -462,7 +462,7 @@ main(int argc, char **argv)
} }
for (i = 1; i < argc; ++i) for (i = 1; i < argc; ++i)
if (strcmp(argv[i], "--version") == 0) { if (strcmp(argv[i], "--version") == 0) {
(void) printf("%s\n", TZVERSION); (void) printf("zic %s%s\n", PKGVERSION, TZVERSION);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} else if (strcmp(argv[i], "--help") == 0) { } else if (strcmp(argv[i], "--help") == 0) {
usage(stdout, EXIT_SUCCESS); usage(stdout, EXIT_SUCCESS);
@@ -2534,8 +2534,8 @@ newabbr(const char *const string)
++cp; ++cp;
if (cp - string == 0) if (cp - string == 0)
mp = _("time zone abbreviation lacks alphabetic at start"); mp = _("time zone abbreviation lacks alphabetic at start");
if (noise && cp - string > 3) if (noise && cp - string < 3)
mp = _("time zone abbreviation has more than 3 alphabetics"); mp = _("time zone abbreviation has fewer than 3 alphabetics");
if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN) if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
mp = _("time zone abbreviation has too many alphabetics"); mp = _("time zone abbreviation has too many alphabetics");
if (mp == NULL && (*cp == '+' || *cp == '-')) { if (mp == NULL && (*cp == '+' || *cp == '-')) {