mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
tar: bump version.
This commit is contained in:
@@ -1,46 +1,14 @@
|
||||
From 3269fb640f76f56b450231ae78576c855da9dda1 Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Sun, 5 Jun 2016 18:48:22 +0000
|
||||
Subject: Use __attribute__ only if gcc > 2.95
|
||||
|
||||
|
||||
diff --git a/lib/wordsplit.h b/lib/wordsplit.h
|
||||
index 575865b..7c787a7 100644
|
||||
--- a/lib/wordsplit.h
|
||||
+++ b/lib/wordsplit.h
|
||||
@@ -40,9 +40,17 @@ struct wordsplit
|
||||
const char *ws_escape;
|
||||
void (*ws_alloc_die) (struct wordsplit * wsp);
|
||||
void (*ws_error) (const char *, ...)
|
||||
+#if 2 < __GNUC__ + (95 < __GNUC_MINOR__)
|
||||
__WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
|
||||
+#else
|
||||
+ ;
|
||||
+#endif
|
||||
void (*ws_debug) (const char *, ...)
|
||||
+#if 2 < __GNUC__ + (95 < __GNUC_MINOR__)
|
||||
__WORDSPLIT_ATTRIBUTE_FORMAT ((__printf__, 1, 2));
|
||||
+#else
|
||||
+ ;
|
||||
+#endif
|
||||
|
||||
const char **ws_env;
|
||||
const char *(*ws_getvar) (const char *, size_t, void *);
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From 67150aab60b3e8219fbd63a2234b229241083ec5 Mon Sep 17 00:00:00 2001
|
||||
From 47f0966e3f0ec873b7d90280a5e89cc251fbf4cb Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Fri, 22 Jun 2018 20:30:40 +0000
|
||||
Subject: C89 fixes for gcc2 compatibility
|
||||
|
||||
|
||||
diff --git a/gnu/backupfile.c b/gnu/backupfile.c
|
||||
index 22f54d3..45f07de 100644
|
||||
index 254c086..83f072e 100644
|
||||
--- a/gnu/backupfile.c
|
||||
+++ b/gnu/backupfile.c
|
||||
@@ -219,6 +219,7 @@ numbered_backup (char **buffer, size_t buffer_size, size_t filelen,
|
||||
@@ -240,6 +240,7 @@ numbered_backup (int dir_fd, char **buffer, size_t buffer_size, size_t filelen,
|
||||
char *q;
|
||||
bool all_9s;
|
||||
size_t versionlen;
|
||||
@@ -48,7 +16,7 @@ index 22f54d3..45f07de 100644
|
||||
|
||||
if (_D_EXACT_NAMLEN (dp) < baselen + 4)
|
||||
continue;
|
||||
@@ -250,12 +251,13 @@ numbered_backup (char **buffer, size_t buffer_size, size_t filelen,
|
||||
@@ -271,12 +272,13 @@ numbered_backup (int dir_fd, char **buffer, size_t buffer_size, size_t filelen,
|
||||
|
||||
versionlenmax = all_9s + versionlen;
|
||||
result = (all_9s ? BACKUP_IS_LONGER : BACKUP_IS_SAME_LENGTH);
|
||||
@@ -64,7 +32,7 @@ index 22f54d3..45f07de 100644
|
||||
if (!new_buf)
|
||||
{
|
||||
*buffer = buf;
|
||||
@@ -293,26 +295,34 @@ backupfile_internal (char const *file, enum backup_type backup_type, bool rename
|
||||
@@ -316,28 +318,37 @@ backupfile_internal (int dir_fd, char const *file,
|
||||
{
|
||||
ptrdiff_t base_offset = last_component (file) - file;
|
||||
size_t filelen = base_offset + strlen (file + base_offset);
|
||||
@@ -74,6 +42,8 @@ index 22f54d3..45f07de 100644
|
||||
+ ssize_t ssize;
|
||||
+ char *s;
|
||||
+ DIR *dirp;
|
||||
+ int sdir;
|
||||
+ size_t base_max;
|
||||
|
||||
if (! simple_backup_suffix)
|
||||
set_simple_backup_suffix (NULL);
|
||||
@@ -96,29 +66,25 @@ index 22f54d3..45f07de 100644
|
||||
return s;
|
||||
|
||||
- DIR *dirp = NULL;
|
||||
- int sdir = -1;
|
||||
- size_t base_max = 0;
|
||||
+ dirp = NULL;
|
||||
+ sdir = -1;
|
||||
+ base_max = 0;
|
||||
while (true)
|
||||
{
|
||||
+ int sdir;
|
||||
+ unsigned flags;
|
||||
+ int e;
|
||||
memcpy (s, file, filelen + 1);
|
||||
|
||||
if (backup_type == simple_backups)
|
||||
@@ -346,16 +356,16 @@ backupfile_internal (char const *file, enum backup_type backup_type, bool rename
|
||||
if (! rename)
|
||||
break;
|
||||
|
||||
- int sdir = dirp ? dirfd (dirp) : -1;
|
||||
+ sdir = dirp ? dirfd (dirp) : -1;
|
||||
if (sdir < 0)
|
||||
{
|
||||
@@ -375,10 +386,10 @@ backupfile_internal (int dir_fd, char const *file,
|
||||
sdir = AT_FDCWD;
|
||||
base_offset = 0;
|
||||
}
|
||||
- unsigned flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
|
||||
+ flags = backup_type == simple_backups ? 0 : RENAME_NOREPLACE;
|
||||
if (renameat2 (AT_FDCWD, file, sdir, s + base_offset, flags) == 0)
|
||||
if (renameatu (AT_FDCWD, file, sdir, s + base_offset, flags) == 0)
|
||||
break;
|
||||
- int e = errno;
|
||||
+ e = errno;
|
||||
@@ -126,7 +92,7 @@ index 22f54d3..45f07de 100644
|
||||
{
|
||||
if (dirp)
|
||||
diff --git a/gnu/parse-datetime.y b/gnu/parse-datetime.y
|
||||
index f8da02d..6c962ae 100644
|
||||
index b264bb7..91793d7 100644
|
||||
--- a/gnu/parse-datetime.y
|
||||
+++ b/gnu/parse-datetime.y
|
||||
@@ -405,8 +405,9 @@ time_zone_str (int time_zone, char time_zone_buf[TIME_ZONE_BUFSIZE])
|
||||
@@ -168,7 +134,7 @@ index f8da02d..6c962ae 100644
|
||||
do
|
||||
{
|
||||
c = *pc->input++;
|
||||
@@ -1617,12 +1619,12 @@ debug_strfdatetime (struct tm const *tm, parser_control const *pc,
|
||||
@@ -1610,12 +1612,12 @@ debug_strfdatetime (struct tm const *tm, parser_control const *pc,
|
||||
if (pc && m < n && pc->zones_seen)
|
||||
{
|
||||
int tz = pc->time_zone;
|
||||
@@ -182,7 +148,7 @@ index f8da02d..6c962ae 100644
|
||||
snprintf (&buf[m], n - m, " TZ=%s", time_zone_str (tz, time_zone_buf));
|
||||
}
|
||||
return buf;
|
||||
@@ -1720,9 +1722,10 @@ parse_datetime (struct timespec *result, char const *p,
|
||||
@@ -1713,9 +1715,10 @@ parse_datetime (struct timespec *result, char const *p,
|
||||
{
|
||||
char const *tzstring = getenv ("TZ");
|
||||
timezone_t tz = tzalloc (tzstring);
|
||||
@@ -194,7 +160,7 @@ index f8da02d..6c962ae 100644
|
||||
tzfree (tz);
|
||||
return ok;
|
||||
}
|
||||
@@ -1749,6 +1752,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -1742,6 +1745,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
Use heap allocation if TZ's length exceeds this. */
|
||||
enum { TZBUFSIZE = 100 };
|
||||
char tz1buf[TZBUFSIZE];
|
||||
@@ -207,7 +173,7 @@ index f8da02d..6c962ae 100644
|
||||
|
||||
struct timespec gettime_buffer;
|
||||
if (! now)
|
||||
@@ -1757,14 +1766,13 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -1750,14 +1759,13 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
now = &gettime_buffer;
|
||||
}
|
||||
|
||||
@@ -223,9 +189,9 @@ index f8da02d..6c962ae 100644
|
||||
- timezone_t tz = tzdefault;
|
||||
+ tz = tzdefault;
|
||||
|
||||
if (strncmp (p, "TZ=\"", 4) == 0)
|
||||
{
|
||||
@@ -1809,7 +1817,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
/* Store a local copy prior to first "goto". Without this, a prior use
|
||||
below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
|
||||
@@ -1807,7 +1815,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -233,7 +199,7 @@ index f8da02d..6c962ae 100644
|
||||
if (! localtime_rz (tz, &now->tv_sec, &tmp))
|
||||
goto fail;
|
||||
|
||||
@@ -1819,7 +1826,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -1817,7 +1824,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
if (*p == '\0')
|
||||
p = "0";
|
||||
|
||||
@@ -241,7 +207,7 @@ index f8da02d..6c962ae 100644
|
||||
pc.input = p;
|
||||
pc.parse_datetime_debug = (flags & PARSE_DATETIME_DEBUG) != 0;
|
||||
if (INT_ADD_WRAPV (tmp.tm_year, TM_YEAR_BASE, &pc.year.value))
|
||||
@@ -1869,11 +1875,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -1867,11 +1873,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
for (quarter = 1; quarter <= 3; quarter++)
|
||||
{
|
||||
intmax_t iprobe;
|
||||
@@ -256,7 +222,7 @@ index f8da02d..6c962ae 100644
|
||||
if (localtime_rz (tz, &probe, &probe_tm) && probe_tm.tm_zone
|
||||
&& probe_tm.tm_isdst != pc.local_time_zone_table[0].value)
|
||||
{
|
||||
@@ -1970,6 +1977,8 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -1968,6 +1975,8 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
*result = pc.seconds;
|
||||
else
|
||||
{
|
||||
@@ -265,7 +231,7 @@ index f8da02d..6c962ae 100644
|
||||
if (1 < (pc.times_seen | pc.dates_seen | pc.days_seen | pc.dsts_seen
|
||||
| (pc.local_zones_seen + pc.zones_seen)))
|
||||
{
|
||||
@@ -2061,9 +2070,10 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -2060,9 +2069,10 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
by setting TZ="XXX1:00" and try mktime again. */
|
||||
|
||||
char tz2buf[sizeof "XXX" - 1 + TIME_ZONE_BUFSIZE];
|
||||
@@ -358,17 +324,17 @@ index f8da02d..6c962ae 100644
|
||||
dbg_printf (_("final: %s (UTC)\n"),
|
||||
debug_strfdatetime (&gmt, NULL,
|
||||
--
|
||||
2.18.0
|
||||
2.19.1
|
||||
|
||||
|
||||
From b7aebf87e65f97062362e8377e20311bc0f15e8e Mon Sep 17 00:00:00 2001
|
||||
From 2ed2c8945e1df5fee542fe52b3ea13137b487449 Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Tue, 18 Sep 2018 11:40:27 +0000
|
||||
Subject: regenerated parse-datetime.c with bison 3.0.5
|
||||
|
||||
|
||||
diff --git a/gnu/parse-datetime.c b/gnu/parse-datetime.c
|
||||
index 600ecf6..b6b987c 100644
|
||||
index 568de6b..4614822 100644
|
||||
--- a/gnu/parse-datetime.c
|
||||
+++ b/gnu/parse-datetime.c
|
||||
@@ -1,19 +1,19 @@
|
||||
@@ -2704,7 +2670,7 @@ index 600ecf6..b6b987c 100644
|
||||
do
|
||||
{
|
||||
c = *pc->input++;
|
||||
@@ -3519,12 +3342,12 @@ debug_strfdatetime (struct tm const *tm, parser_control const *pc,
|
||||
@@ -3512,12 +3335,12 @@ debug_strfdatetime (struct tm const *tm, parser_control const *pc,
|
||||
if (pc && m < n && pc->zones_seen)
|
||||
{
|
||||
int tz = pc->time_zone;
|
||||
@@ -2718,7 +2684,7 @@ index 600ecf6..b6b987c 100644
|
||||
snprintf (&buf[m], n - m, " TZ=%s", time_zone_str (tz, time_zone_buf));
|
||||
}
|
||||
return buf;
|
||||
@@ -3622,9 +3445,10 @@ parse_datetime (struct timespec *result, char const *p,
|
||||
@@ -3615,9 +3438,10 @@ parse_datetime (struct timespec *result, char const *p,
|
||||
{
|
||||
char const *tzstring = getenv ("TZ");
|
||||
timezone_t tz = tzalloc (tzstring);
|
||||
@@ -2730,7 +2696,7 @@ index 600ecf6..b6b987c 100644
|
||||
tzfree (tz);
|
||||
return ok;
|
||||
}
|
||||
@@ -3651,6 +3475,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -3644,6 +3468,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
Use heap allocation if TZ's length exceeds this. */
|
||||
enum { TZBUFSIZE = 100 };
|
||||
char tz1buf[TZBUFSIZE];
|
||||
@@ -2743,7 +2709,7 @@ index 600ecf6..b6b987c 100644
|
||||
|
||||
struct timespec gettime_buffer;
|
||||
if (! now)
|
||||
@@ -3659,14 +3489,13 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -3652,14 +3482,13 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
now = &gettime_buffer;
|
||||
}
|
||||
|
||||
@@ -2759,9 +2725,9 @@ index 600ecf6..b6b987c 100644
|
||||
- timezone_t tz = tzdefault;
|
||||
+ tz = tzdefault;
|
||||
|
||||
if (strncmp (p, "TZ=\"", 4) == 0)
|
||||
{
|
||||
@@ -3711,7 +3540,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
/* Store a local copy prior to first "goto". Without this, a prior use
|
||||
below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
|
||||
@@ -3709,7 +3538,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2769,7 +2735,7 @@ index 600ecf6..b6b987c 100644
|
||||
if (! localtime_rz (tz, &now->tv_sec, &tmp))
|
||||
goto fail;
|
||||
|
||||
@@ -3721,7 +3549,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -3719,7 +3547,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
if (*p == '\0')
|
||||
p = "0";
|
||||
|
||||
@@ -2777,7 +2743,7 @@ index 600ecf6..b6b987c 100644
|
||||
pc.input = p;
|
||||
pc.parse_datetime_debug = (flags & PARSE_DATETIME_DEBUG) != 0;
|
||||
if (INT_ADD_WRAPV (tmp.tm_year, TM_YEAR_BASE, &pc.year.value))
|
||||
@@ -3771,11 +3598,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -3769,11 +3596,12 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
for (quarter = 1; quarter <= 3; quarter++)
|
||||
{
|
||||
intmax_t iprobe;
|
||||
@@ -2792,7 +2758,7 @@ index 600ecf6..b6b987c 100644
|
||||
if (localtime_rz (tz, &probe, &probe_tm) && probe_tm.tm_zone
|
||||
&& probe_tm.tm_isdst != pc.local_time_zone_table[0].value)
|
||||
{
|
||||
@@ -3872,6 +3700,8 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -3870,6 +3698,8 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
*result = pc.seconds;
|
||||
else
|
||||
{
|
||||
@@ -2801,7 +2767,7 @@ index 600ecf6..b6b987c 100644
|
||||
if (1 < (pc.times_seen | pc.dates_seen | pc.days_seen | pc.dsts_seen
|
||||
| (pc.local_zones_seen + pc.zones_seen)))
|
||||
{
|
||||
@@ -3963,9 +3793,10 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
@@ -3962,9 +3792,10 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
by setting TZ="XXX1:00" and try mktime again. */
|
||||
|
||||
char tz2buf[sizeof "XXX" - 1 + TIME_ZONE_BUFSIZE];
|
||||
@@ -2894,5 +2860,226 @@ index 600ecf6..b6b987c 100644
|
||||
dbg_printf (_("final: %s (UTC)\n"),
|
||||
debug_strfdatetime (&gmt, NULL,
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
From d4774dba0a27f8900aa594c63f8ff1900b29a15d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sun, 31 Mar 2019 13:33:43 +0200
|
||||
Subject: more gcc2 patch.
|
||||
|
||||
|
||||
diff --git a/gnu/filenamecat-lgpl.c b/gnu/filenamecat-lgpl.c
|
||||
index 98b105a..854a4d0 100644
|
||||
--- a/gnu/filenamecat-lgpl.c
|
||||
+++ b/gnu/filenamecat-lgpl.c
|
||||
@@ -51,6 +51,8 @@ mfile_name_concat (char const *dir, char const *base, char **base_in_result)
|
||||
size_t dirlen = dirbase - dir + dirbaselen;
|
||||
size_t baselen = strlen (base);
|
||||
char sep = '\0';
|
||||
+ char *p_concat;
|
||||
+ char *p;
|
||||
if (dirbaselen)
|
||||
{
|
||||
/* DIR is not a file system root, so separate with / if needed. */
|
||||
@@ -67,8 +69,7 @@ mfile_name_concat (char const *dir, char const *base, char **base_in_result)
|
||||
sep = '.';
|
||||
}
|
||||
|
||||
- char *p_concat = malloc (dirlen + (sep != '\0') + baselen + 1);
|
||||
- char *p;
|
||||
+ p_concat = malloc (dirlen + (sep != '\0') + baselen + 1);
|
||||
|
||||
if (p_concat == NULL)
|
||||
return NULL;
|
||||
diff --git a/gnu/mktime.c b/gnu/mktime.c
|
||||
index d411aa7..78aa713 100644
|
||||
--- a/gnu/mktime.c
|
||||
+++ b/gnu/mktime.c
|
||||
@@ -274,6 +274,9 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
|
||||
long_int t1 = (*t < mktime_min ? mktime_min
|
||||
: *t <= mktime_max ? *t : mktime_max);
|
||||
struct tm *r = convert_time (convert, t1, tp);
|
||||
+ long_int bad;
|
||||
+ long_int ok;
|
||||
+ struct tm oktm; oktm.tm_sec = -1;
|
||||
if (r)
|
||||
{
|
||||
*t = t1;
|
||||
@@ -282,9 +285,8 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
|
||||
if (errno != EOVERFLOW)
|
||||
return NULL;
|
||||
|
||||
- long_int bad = t1;
|
||||
- long_int ok = 0;
|
||||
- struct tm oktm; oktm.tm_sec = -1;
|
||||
+ bad = t1;
|
||||
+ ok = 0;
|
||||
|
||||
/* BAD is a known out-of-range value, and OK is a known in-range one.
|
||||
Use binary search to narrow the range between BAD and OK until
|
||||
@@ -366,6 +368,8 @@ __mktime_internal (struct tm *tp,
|
||||
int negative_offset_guess;
|
||||
|
||||
int sec_requested = sec;
|
||||
+ long_int t0;
|
||||
+ long_int t, t1, t2;
|
||||
|
||||
if (LEAP_SECONDS_POSSIBLE)
|
||||
{
|
||||
@@ -381,18 +385,19 @@ __mktime_internal (struct tm *tp,
|
||||
time. */
|
||||
|
||||
INT_SUBTRACT_WRAPV (0, off, &negative_offset_guess);
|
||||
- long_int t0 = ydhms_diff (year, yday, hour, min, sec,
|
||||
+ t0 = ydhms_diff (year, yday, hour, min, sec,
|
||||
EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0,
|
||||
negative_offset_guess);
|
||||
- long_int t = t0, t1 = t0, t2 = t0;
|
||||
+ t = t0, t1 = t0, t2 = t0;
|
||||
|
||||
/* Repeatedly use the error to improve the guess. */
|
||||
|
||||
while (true)
|
||||
{
|
||||
+ long_int dt;
|
||||
if (! ranged_convert (convert, &t, &tm))
|
||||
return -1;
|
||||
- long_int dt = tm_diff (year, yday, hour, min, sec, &tm);
|
||||
+ dt = tm_diff (year, yday, hour, min, sec, &tm);
|
||||
if (dt == 0)
|
||||
break;
|
||||
|
||||
@@ -524,13 +529,15 @@ __mktime_internal (struct tm *tp,
|
||||
time_t
|
||||
mktime (struct tm *tp)
|
||||
{
|
||||
+# if defined _LIBC || NEED_MKTIME_WORKING
|
||||
+ static mktime_offset_t localtime_offset;
|
||||
+# endif
|
||||
/* POSIX.1 8.1.1 requires that whenever mktime() is called, the
|
||||
time zone names contained in the external variable 'tzname' shall
|
||||
be set as if the tzset() function had been called. */
|
||||
__tzset ();
|
||||
|
||||
# if defined _LIBC || NEED_MKTIME_WORKING
|
||||
- static mktime_offset_t localtime_offset;
|
||||
return __mktime_internal (tp, __localtime_r, &localtime_offset);
|
||||
# else
|
||||
# undef mktime
|
||||
diff --git a/gnu/opendirat.c b/gnu/opendirat.c
|
||||
index ad63131..ddcec78 100644
|
||||
--- a/gnu/opendirat.c
|
||||
+++ b/gnu/opendirat.c
|
||||
@@ -38,10 +38,11 @@ opendirat (int dir_fd, char const *dir, int extra_flags, int *pnew_fd)
|
||||
int open_flags = (O_RDONLY | O_CLOEXEC | O_DIRECTORY | O_NOCTTY
|
||||
| O_NONBLOCK | extra_flags);
|
||||
int new_fd = openat (dir_fd, dir, open_flags);
|
||||
+ DIR *dirp;
|
||||
|
||||
if (new_fd < 0)
|
||||
return NULL;
|
||||
- DIR *dirp = fdopendir (new_fd);
|
||||
+ dirp = fdopendir (new_fd);
|
||||
if (dirp)
|
||||
*pnew_fd = new_fd;
|
||||
else
|
||||
diff --git a/gnu/parse-datetime.c b/gnu/parse-datetime.c
|
||||
index 4614822..86b9a21 100644
|
||||
--- a/gnu/parse-datetime.c
|
||||
+++ b/gnu/parse-datetime.c
|
||||
@@ -3475,6 +3475,11 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
struct tm tmp;
|
||||
parser_control pc;
|
||||
|
||||
+ /* Store a local copy prior to first "goto". Without this, a prior use
|
||||
+ below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
|
||||
+ to-temporary, which would trigger a -Wjump-misses-init warning. */
|
||||
+ const relative_time rel_time_0 = RELATIVE_TIME_0;
|
||||
+
|
||||
struct timespec gettime_buffer;
|
||||
if (! now)
|
||||
{
|
||||
@@ -3490,11 +3495,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
|
||||
tz = tzdefault;
|
||||
|
||||
- /* Store a local copy prior to first "goto". Without this, a prior use
|
||||
- below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
|
||||
- to-temporary, which would trigger a -Wjump-misses-init warning. */
|
||||
- const relative_time rel_time_0 = RELATIVE_TIME_0;
|
||||
-
|
||||
if (strncmp (p, "TZ=\"", 4) == 0)
|
||||
{
|
||||
char const *tzbase = p + 4;
|
||||
diff --git a/gnu/parse-datetime.y b/gnu/parse-datetime.y
|
||||
index 91793d7..a98e78a 100644
|
||||
--- a/gnu/parse-datetime.y
|
||||
+++ b/gnu/parse-datetime.y
|
||||
@@ -1752,6 +1752,11 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
struct tm tmp;
|
||||
parser_control pc;
|
||||
|
||||
+ /* Store a local copy prior to first "goto". Without this, a prior use
|
||||
+ below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
|
||||
+ to-temporary, which would trigger a -Wjump-misses-init warning. */
|
||||
+ const relative_time rel_time_0 = RELATIVE_TIME_0;
|
||||
+
|
||||
struct timespec gettime_buffer;
|
||||
if (! now)
|
||||
{
|
||||
@@ -1767,11 +1772,6 @@ parse_datetime2 (struct timespec *result, char const *p,
|
||||
|
||||
tz = tzdefault;
|
||||
|
||||
- /* Store a local copy prior to first "goto". Without this, a prior use
|
||||
- below of RELATIVE_TIME_0 on the RHS might translate to an assignment-
|
||||
- to-temporary, which would trigger a -Wjump-misses-init warning. */
|
||||
- const relative_time rel_time_0 = RELATIVE_TIME_0;
|
||||
-
|
||||
if (strncmp (p, "TZ=\"", 4) == 0)
|
||||
{
|
||||
char const *tzbase = p + 4;
|
||||
diff --git a/gnu/regexec.c b/gnu/regexec.c
|
||||
index 21cf791..d800a69 100644
|
||||
--- a/gnu/regexec.c
|
||||
+++ b/gnu/regexec.c
|
||||
@@ -3302,6 +3302,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
|
||||
re_node_set dests_node[SBC_MAX];
|
||||
bitset_t dests_ch[SBC_MAX];
|
||||
} *dests_alloc;
|
||||
+ size_t ndests_max;
|
||||
|
||||
/* We build DFA states which corresponds to the destination nodes
|
||||
from 'state'. 'dests_node[i]' represents the nodes which i-th
|
||||
@@ -3346,7 +3347,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
|
||||
goto out_free;
|
||||
|
||||
/* Avoid arithmetic overflow in size calculation. */
|
||||
- size_t ndests_max
|
||||
+ ndests_max
|
||||
= ((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX)
|
||||
/ (3 * sizeof (re_dfastate_t *)));
|
||||
if (__glibc_unlikely (ndests_max < ndests))
|
||||
diff --git a/lib/wordsplit.h b/lib/wordsplit.h
|
||||
index ff7f6e3..415814f 100644
|
||||
--- a/lib/wordsplit.h
|
||||
+++ b/lib/wordsplit.h
|
||||
@@ -61,12 +61,10 @@ struct wordsplit
|
||||
void (*ws_alloc_die) (wordsplit_t *wsp);
|
||||
/* [Input] (WRDSF_ALLOC_DIE) Function called when
|
||||
out of memory. Must not return. */
|
||||
- void (*ws_error) (const char *, ...)
|
||||
- __attribute__ ((__format__ (__printf__, 1, 2)));
|
||||
+ void (*ws_error) (const char *, ...);
|
||||
/* [Input] (WRDSF_ERROR) Function used for error
|
||||
reporting */
|
||||
- void (*ws_debug) (const char *, ...)
|
||||
- __attribute__ ((__format__ (__printf__, 1, 2)));
|
||||
+ void (*ws_debug) (const char *, ...);
|
||||
/* [Input] (WRDSF_DEBUG) Function used for debug
|
||||
output. */
|
||||
const char **ws_env; /* [Input] (WRDSF_ENV, !WRDSF_NOVAR) Array of
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -15,7 +15,7 @@ LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2
|
||||
https://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0beac63b7"
|
||||
CHECKSUM_SHA256="e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566"
|
||||
if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
|
||||
PATCHES="tar-$portVersion-gcc2.patchset"
|
||||
fi
|
||||
@@ -71,8 +71,6 @@ BUILD()
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/charset.alias
|
||||
}
|
||||
|
||||
TEST()
|
||||
Reference in New Issue
Block a user