Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=8600d1f3b89e710c52cf1278f235b53e3b0d24d6

commit 8600d1f3b89e710c52cf1278f235b53e3b0d24d6
Author: crazy <cr...@frugalware.org>
Date:   Fri Feb 2 12:44:22 2018 +0100

glibc-2.27-1-x86_64

* Version bump
* only 4 real fixes compared to our snapshot and one revert

diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild
index 40d6ad6..646b910 100644
--- a/source/base/glibc/FrugalBuild
+++ b/source/base/glibc/FrugalBuild
@@ -7,9 +7,9 @@
## IF you still want to BUMP rebuild the TOOLCHAIN!!

pkgname=glibc
-pkgver=2.26.9000
-pkgrel=3
-_githash="-1167-g2ec0e7eade"
+pkgver=2.27
+pkgrel=1
+_githash=
pkgdesc="GNU C Library"
url="http://www.gnu.org/software/libc/libc.html";
depends=()
@@ -20,12 +20,8 @@ groups=('base' 'chroot-core')
archs=('x86_64')
Fup2gnubz2
_dlurl="http://ftp.gnu.org/pub/gnu/glibc";
-#source=($_dlurl/glibc-$pkgver.tar.xz
-#      
glibc-2.26-branch-on-commit-51600b0fd76ce1d4a0eb1159087cab4fc3937dd6.patch.gz \
-#      gshadow.patch)
-## TMP before 2.27 releases
-source=(http://ftp.frugalware.org/pub/other/people/crazy/$pkgname-$pkgver$_githash.tar.xz)
-sha1sums=('e270a68b4f7e329280b93ffab730f41f8dc94bb2')
+source=($_dlurl/glibc-$pkgver.tar.xz)
+sha1sums=('1f7a9c43026484943ef7cf6885f2176a2bc1e093')
options+=('scriptlet' 'noccache' 'static' 'nostrip' 'nofortify')


diff --git 
a/source/base/glibc/glibc-2.26-branch-on-commit-51600b0fd76ce1d4a0eb1159087cab4fc3937dd6.patch.gz
 
b/source/base/glibc/glibc-2.26-branch-on-commit-51600b0fd76ce1d4a0eb1159087cab4fc3937dd6.patch.gz
deleted file mode 100644
index a67906f..0000000
Binary files 
a/source/base/glibc/glibc-2.26-branch-on-commit-51600b0fd76ce1d4a0eb1159087cab4fc3937dd6.patch.gz
 and /dev/null differ
diff --git a/source/base/glibc/gshadow.patch b/source/base/glibc/gshadow.patch
deleted file mode 100644
index a0351f6..0000000
--- a/source/base/glibc/gshadow.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 74250a7cdf106d4ca7d9506e6d5dc7c448dc3434 Mon Sep 17 00:00:00 2001
-From: David Michael <david.mich...@coreos.com>
-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 <libio/iolibio.h>.
-       (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 <gshadow.h>
- #include <stdio.h>
-
-+#include <libio/iolibio.h>
-+#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 <nss/nss_files/files-parse.c>
-
-
--/* 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,
--                         &errno));
-+           || ! (parse_result = parse_line (p, resbuf,
-+                                            (void *) buffer, buflen,
-+                                            &errno)));
-+
-+  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 parser function is already defined in sgetspent_r.c, so use that
-+/* Our parser function is already defined in sgetsgent_r.c, so use that
-    to parse lines from the database file.  */
- #define EXTERN_PARSER
- #include "files-parse.c"
---
-2.7.4
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to