[arch-commits] Commit in glibc/trunk (PKGBUILD bz20338.patch)
Date: Sunday, August 9, 2020 @ 17:09:53
Author: bpiotrowski
Revision: 393473
2.32-1
Modified:
glibc/trunk/PKGBUILD
Deleted:
glibc/trunk/bz20338.patch
---+
PKGBUILD | 22 +-
bz20338.patch | 114
2 files changed, 12 insertions(+), 124 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-09 17:08:09 UTC (rev 393472)
+++ PKGBUILD2020-08-09 17:09:53 UTC (rev 393473)
@@ -6,30 +6,29 @@
pkgbase=glibc
pkgname=(glibc lib32-glibc)
-pkgver=2.31
-pkgrel=5
+pkgver=2.32
+pkgrel=1
arch=(x86_64)
url='https://www.gnu.org/software/libc'
license=(GPL LGPL)
makedepends=(git gd lib32-gcc-libs python)
options=(!strip staticlibs)
-#source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
-_commit=18fdba553dd9b907e9812b90d2cea593f776058f
-source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
+#_commit=3de512be7ea6053255afed6154db9ee31d4e557a
+#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
+source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
locale.gen.txt
locale-gen
lib32-glibc.conf
-sdt.h sdt-config.h
-bz20338.patch)
+sdt.h sdt-config.h)
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
-md5sums=('SKIP'
+md5sums=('720c7992861c57cf97d66a2f36d8d1fa'
+ 'SKIP'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf'
'6e052f1cb693d5d3203f50f9d4e8c33b'
'91fec3b7e75510ae2ac42533aa2e695e'
- '680df504c683640b02ed4a805797c0b2'
- '430673eccc78e52c249aa4b0f1786450')
+ '680df504c683640b02ed4a805797c0b2')
prepare() {
mkdir -p glibc-build lib32-glibc-build
@@ -194,6 +193,9 @@
# libraries too. Useful for gdb's catch command.
install -Dm644 "$srcdir/sdt.h" "$pkgdir/usr/include/sys/sdt.h"
install -Dm644 "$srcdir/sdt-config.h" "$pkgdir/usr/include/sys/sdt-config.h"
+
+ # Provided by libxcrypt; keep the old shared library for backwards
compatibility
+ rm -f "$pkgdir"/usr/include/crypt.h "$pkgdir"/usr/lib/libcrypt.a
}
package_lib32-glibc() {
Deleted: bz20338.patch
===
--- bz20338.patch 2020-08-09 17:08:09 UTC (rev 393472)
+++ bz20338.patch 2020-08-09 17:09:53 UTC (rev 393473)
@@ -1,114 +0,0 @@
-From 74250a7cdf106d4ca7d9506e6d5dc7c448dc3434 Mon Sep 17 00:00:00 2001
-From: David Michael
-Date: Thu, 15 Dec 2016 15:22:57 -0800
-Subject: [PATCH] gshadow: Sync fgetsgent_r.c with grp/fgetgrent_r.c
-
- [BZ #20338]
- * gshadow/fgetsgent_r.c: Include .
- (flockfile): New macro.
- (funlockfile): Likewise.
- (__fgetsgent_r): Sync with __fgetgrent_r.
- * nss/nss_files/files-sgrp.c: Fix "fgetsgent_r.c" typo.
- gshadow/fgetsgent_r.c | 35 ---
- nss/nss_files/files-sgrp.c | 2 +-
- 2 files changed, 25 insertions(+), 12 deletions(-)
-
-diff --git a/gshadow/fgetsgent_r.c b/gshadow/fgetsgent_r.c
-index b70f6fa..02cd33a 100644
a/gshadow/fgetsgent_r.c
-+++ b/gshadow/fgetsgent_r.c
-@@ -20,39 +20,44 @@
- #include
- #include
-
-+#include
-+#define flockfile(s) _IO_flockfile (s)
-+#define funlockfile(s) _IO_funlockfile (s)
-+
- /* Define a line parsing function using the common code
-used in the nss_files module. */
-
- #define STRUCTURE sgrp
- #define ENTNAME sgent
--#define EXTERN_PARSER 1
-+#define EXTERN_PARSER 1
- struct sgent_data {};
-
- #include
-
-
--/* Read one shadow entry from the given stream. */
-+/* Read one entry from the given stream. */
- int
- __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
- struct sgrp **result)
- {
- char *p;
-+ int parse_result;
-
-- _IO_flockfile (stream);
-+ flockfile (stream);
- do
- {
- buffer[buflen - 1] = '\xff';
- p = fgets_unlocked (buffer, buflen, stream);
-- if (p == NULL && feof_unlocked (stream))
-+ if (__builtin_expect (p == NULL, 0) && feof_unlocked (stream))
- {
--_IO_funlockfile (stream);
-+funlockfile (stream);
- *result = NULL;
- __set_errno (ENOENT);
- return errno;
- }
-- if (p == NULL || buffer[buflen - 1] != '\xff')
-+ if (__builtin_expect (p == NULL, 0) || buffer[buflen - 1] != '\xff')
- {
--_IO_funlockfile (stream);
-+funlockfile (stream);
- *result = NULL;
- __set_errno (ERANGE);
- return errno;
-@@ -61,13 +66,21 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char
*buffer, size_t buflen,
- /* Skip leading blanks. */
- while (isspace (*p))
- ++p;
--} while (*p == '\0' || *p == '#' /* Ignore empty and comment
[arch-commits] Commit in glibc/trunk (PKGBUILD bz20338.patch)
Date: Friday, August 10, 2018 @ 22:14:15
Author: bpiotrowski
Revision: 331367
2.28-4: restore mistakenly removed fix for BZ#20338
Added:
glibc/trunk/bz20338.patch
Modified:
glibc/trunk/PKGBUILD
---+
PKGBUILD |4 +
bz20338.patch | 114
2 files changed, 117 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-10 21:59:53 UTC (rev 331366)
+++ PKGBUILD2018-08-10 22:14:15 UTC (rev 331367)
@@ -8,7 +8,7 @@
pkgbase=glibc
pkgname=(glibc lib32-glibc)
pkgver=2.28
-pkgrel=3
+pkgrel=4
arch=(x86_64)
url='http://www.gnu.org/software/libc'
license=(GPL LGPL)
@@ -20,6 +20,7 @@
locale.gen.txt
locale-gen
lib32-glibc.conf
+bz20338.patch
bz23497.patch
0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch)
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8) # Carlos O'Donell
@@ -28,6 +29,7 @@
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf'
'6e052f1cb693d5d3203f50f9d4e8c33b'
+ 'dc0d3ad59aeaaf591b085a77de6e03e9'
'11bca140697b1bdb656742e2a12c2982'
'58ffe75a9c5a1b22c535a5c2e725db22')
Added: bz20338.patch
===
--- bz20338.patch (rev 0)
+++ bz20338.patch 2018-08-10 22:14:15 UTC (rev 331367)
@@ -0,0 +1,114 @@
+From 74250a7cdf106d4ca7d9506e6d5dc7c448dc3434 Mon Sep 17 00:00:00 2001
+From: David Michael
+Date: Thu, 15 Dec 2016 15:22:57 -0800
+Subject: [PATCH] gshadow: Sync fgetsgent_r.c with grp/fgetgrent_r.c
+
+ [BZ #20338]
+ * gshadow/fgetsgent_r.c: Include .
+ (flockfile): New macro.
+ (funlockfile): Likewise.
+ (__fgetsgent_r): Sync with __fgetgrent_r.
+ * nss/nss_files/files-sgrp.c: Fix "fgetsgent_r.c" typo.
+---
+ gshadow/fgetsgent_r.c | 35 ---
+ nss/nss_files/files-sgrp.c | 2 +-
+ 2 files changed, 25 insertions(+), 12 deletions(-)
+
+diff --git a/gshadow/fgetsgent_r.c b/gshadow/fgetsgent_r.c
+index b70f6fa..02cd33a 100644
+--- a/gshadow/fgetsgent_r.c
b/gshadow/fgetsgent_r.c
+@@ -20,39 +20,44 @@
+ #include
+ #include
+
++#include
++#define flockfile(s) _IO_flockfile (s)
++#define funlockfile(s) _IO_funlockfile (s)
++
+ /* Define a line parsing function using the common code
+used in the nss_files module. */
+
+ #define STRUCTURE sgrp
+ #define ENTNAME sgent
+-#define EXTERN_PARSER 1
++#define EXTERN_PARSER 1
+ struct sgent_data {};
+
+ #include
+
+
+-/* Read one shadow entry from the given stream. */
++/* Read one entry from the given stream. */
+ int
+ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
+ struct sgrp **result)
+ {
+ char *p;
++ int parse_result;
+
+- _IO_flockfile (stream);
++ flockfile (stream);
+ do
+ {
+ buffer[buflen - 1] = '\xff';
+ p = fgets_unlocked (buffer, buflen, stream);
+- if (p == NULL && feof_unlocked (stream))
++ if (__builtin_expect (p == NULL, 0) && feof_unlocked (stream))
+ {
+-_IO_funlockfile (stream);
++funlockfile (stream);
+ *result = NULL;
+ __set_errno (ENOENT);
+ return errno;
+ }
+- if (p == NULL || buffer[buflen - 1] != '\xff')
++ if (__builtin_expect (p == NULL, 0) || buffer[buflen - 1] != '\xff')
+ {
+-_IO_funlockfile (stream);
++funlockfile (stream);
+ *result = NULL;
+ __set_errno (ERANGE);
+ return errno;
+@@ -61,13 +66,21 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char
*buffer, size_t buflen,
+ /* Skip leading blanks. */
+ while (isspace (*p))
+ ++p;
+-} while (*p == '\0' || *p == '#' || /* Ignore empty and comment
lines. */
++} while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
+/* Parse the line. If it is invalid, loop to
+ get the next line of the file to parse. */
+- ! parse_line (buffer, (void *) resbuf, (void *) buffer, buflen,
+- ));
++ || ! (parse_result = parse_line (p, resbuf,
++(void *) buffer, buflen,
++)));
++
++ funlockfile (stream);
+
+- _IO_funlockfile (stream);
++ if (__builtin_expect (parse_result, 0) == -1)
++{
++ /* The parser ran out of space. */
++ *result = NULL;
++ return errno;
++}
+
+ *result = resbuf;
+ return 0;
+diff --git a/nss/nss_files/files-sgrp.c b/nss/nss_files/files-sgrp.c
+index 15dc659..05c3805 100644
+--- a/nss/nss_files/files-sgrp.c
b/nss/nss_files/files-sgrp.c
+@@ -23,7 +23,7 @@
+ #define DATABASE "gshadow"
+ struct sgent_data {};
+
+-/* Our
