package/safeclib: bump to version 17102019
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Tue, 29 Oct 2019 08:52:43 +0000 (09:52 +0100)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tue, 29 Oct 2019 22:44:19 +0000 (23:44 +0100)
- Use official tarball (which contains a configure so drop autoreconf)
- Drop first and second patches (already in version)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/safeclib/0001-Add-disable-doc-option.patch [deleted file]
package/safeclib/0001-Define-_GNU_SOURCE-when-needed.patch [new file with mode: 0644]
package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch [deleted file]
package/safeclib/0003-Define-_GNU_SOURCE-when-needed.patch [deleted file]
package/safeclib/safeclib.hash
package/safeclib/safeclib.mk

diff --git a/package/safeclib/0001-Add-disable-doc-option.patch b/package/safeclib/0001-Add-disable-doc-option.patch
deleted file mode 100644 (file)
index 5d71173..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0d56b6327f6b652511c3e4c72382f4dc4d194e10 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 15 Mar 2018 20:12:28 +0100
-Subject: [PATCH] Add --disable-doc option
-
-This option allows the user to disable man pages even if pod2man and
-doxygen programs are found
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Upstream-status: Accepted (https://github.com/rurban/safeclib/commit/86404f0e2a7f2a9cad9c916b643594d4d07721d1)
----
- Makefile.am  |  2 ++
- configure.ac | 10 ++++++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0f65c5c1..ce1424bb 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -104,6 +104,7 @@ LIBTOOL_DISTCLEAN_FILES = \
-       build-tools/test-driver
- DISTCLEANFILES = .version
-+if ENABLE_DOC
- MAN1_SOURCES = doc/man/man1/check_for_unsafe_apis.1
- dist_man_MANS =
- if HAVE_POD2MAN
-@@ -560,6 +561,7 @@ clean-local:
-       rm -rf $(builddir)/doc/html
-       rm -rf $(builddir)/doc/man
- endif
-+endif
- if ENABLE_GCOV
- gcov: check
-diff --git a/configure.ac b/configure.ac
-index 0e4e5eea..33ed7326 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -339,6 +339,16 @@ else
-       AC_MSG_RESULT([no (default)])
- fi
-+AC_ARG_ENABLE(doc,
-+      AS_HELP_STRING([--disable-doc],
-+                     [disable documentation @<:@default=no@:>@]),
-+      [case "${enableval}" in
-+      yes) enable_doc=true ;;
-+      no)  enable_doc=false ;;
-+      *)   AC_MSG_ERROR([bad value ${enableval} for --enable-doc]) ;;
-+      esac], [enable_doc=true])
-+AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" = "xtrue")
-+
- dnl for windows dllimport. checking pic_flag DLL_EXPORT would be better,
- dnl but this is only enabled for the shared objs, and we need it in the config
- dnl for our tests.
--- 
-2.14.1
-
diff --git a/package/safeclib/0001-Define-_GNU_SOURCE-when-needed.patch b/package/safeclib/0001-Define-_GNU_SOURCE-when-needed.patch
new file mode 100644 (file)
index 0000000..cc9e580
--- /dev/null
@@ -0,0 +1,115 @@
+From 94c7b765202fe50894425364834beca79e52b255 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 28 Oct 2019 17:09:43 +0100
+Subject: [PATCH] Define _GNU_SOURCE when needed
+
+Define _GNU_SOURCE to fix build with musl otherwise we'll got the
+following build failures due to localtime_r, strnlen, gmtime_r and
+asctime_r being undefined:
+
+os/localtime_s.c:124:12: error: implicit declaration of function 'localtime_r'; did you mean 'localtime_s'? [-Werror=implicit-function-declaration]
+     dest = localtime_r(timer, dest);
+            ^~~~~~~~~~~
+
+io/gets_s.c:144:32: error: implicit declaration of function 'strnlen'; did you mean 'strlen'? [-Werror=implicit-function-declaration]
+         rsize_t len = (rsize_t)strnlen(dest, dmax);
+                                ^~~~~~~
+                                strlen
+
+An other option would be to define AC_GNU_SOURCE in the configure.ac but
+it seems that there is some handling of _GNU_SOURCE in
+safeclib_private.h
+
+Fixes:
+ - http://autobuild.buildroot.net/results/31a4b647ec0dcd9f517f313ec6c7c8f56da1ee47
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/rurban/safeclib/commit/94c7b765202fe50894425364834beca79e52b255]
+---
+ src/extmem/memzero_s.c | 2 ++
+ src/io/gets_s.c        | 2 ++
+ src/os/asctime_s.c     | 2 ++
+ src/os/ctime_s.c       | 2 ++
+ src/os/gmtime_s.c      | 2 ++
+ src/os/localtime_s.c   | 2 ++
+ 6 files changed, 12 insertions(+)
+
+diff --git a/src/extmem/memzero_s.c b/src/extmem/memzero_s.c
+index 75107215..20cb2784 100644
+--- a/src/extmem/memzero_s.c
++++ b/src/extmem/memzero_s.c
+@@ -31,6 +31,8 @@
+  *------------------------------------------------------------------
+  */
++#define _GNU_SOURCE
++
+ #ifdef FOR_DOXYGEN
+ #include "safe_mem_lib.h"
+ #else
+diff --git a/src/io/gets_s.c b/src/io/gets_s.c
+index 09350b3d..be875a1c 100644
+--- a/src/io/gets_s.c
++++ b/src/io/gets_s.c
+@@ -29,6 +29,8 @@
+  *------------------------------------------------------------------
+  */
++#define _GNU_SOURCE
++
+ #ifdef FOR_DOXYGEN
+ #include "safe_lib.h"
+ #else
+diff --git a/src/os/asctime_s.c b/src/os/asctime_s.c
+index 42669844..01cefd8f 100644
+--- a/src/os/asctime_s.c
++++ b/src/os/asctime_s.c
+@@ -29,6 +29,8 @@
+  *------------------------------------------------------------------
+  */
++#define _GNU_SOURCE
++
+ #ifdef FOR_DOXYGEN
+ #include "safe_lib.h"
+ #else
+diff --git a/src/os/ctime_s.c b/src/os/ctime_s.c
+index 01b31f63..7a1a138c 100644
+--- a/src/os/ctime_s.c
++++ b/src/os/ctime_s.c
+@@ -29,6 +29,8 @@
+  *------------------------------------------------------------------
+  */
++#define _GNU_SOURCE
++
+ #ifdef FOR_DOXYGEN
+ #include "safe_lib.h"
+ #else
+diff --git a/src/os/gmtime_s.c b/src/os/gmtime_s.c
+index ff9a0e24..cd8f064f 100644
+--- a/src/os/gmtime_s.c
++++ b/src/os/gmtime_s.c
+@@ -29,6 +29,8 @@
+  *------------------------------------------------------------------
+  */
++#define _GNU_SOURCE
++
+ #ifdef FOR_DOXYGEN
+ #include "safe_lib.h"
+ #else
+diff --git a/src/os/localtime_s.c b/src/os/localtime_s.c
+index 0ce3324b..92ea21b9 100644
+--- a/src/os/localtime_s.c
++++ b/src/os/localtime_s.c
+@@ -29,6 +29,8 @@
+  *------------------------------------------------------------------
+  */
++#define _GNU_SOURCE
++
+ #ifdef FOR_DOXYGEN
+ #include "safe_lib.h"
+ #else
diff --git a/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch b/package/safeclib/0002-add-pic_flag-to-RETPOLINE-cflags-and-ldflags.patch
deleted file mode 100644 (file)
index f4f4eaa..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 23ae79fe84a3fa5d995b8c6b9be70587e37a6cd8 Mon Sep 17 00:00:00 2001
-From: Reini Urban <rurban@cpan.org>
-Date: Mon, 26 Mar 2018 18:31:30 +0200
-Subject: [PATCH] add pic_flag to RETPOLINE cflags and ldflags
-
-This fixes the linke probe, and fixes #55.
-Also: libtool is stripping pic_flags from the shared link cmd.
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/rurban/safeclib/commit/23ae79fe84a3fa5d995b8c6b9be70587e37a6cd8]
----
- configure.ac                    | 2 +-
- m4/ax_compiler_flags_cflags.m4  | 4 ++--
- m4/ax_compiler_flags_ldflags.m4 | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 33ed7326..10325dc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@
- # 2017  Reini Urban <rurban@cpan.org>
- #
- # Copyright (c) 2012, 2013 Cisco Systems
--# Copyright (c) 2017 Reini Urban
-+# Copyright (c) 2017, 2018 Reini Urban
- # All rights reserved.
- #
- # Permission is hereby granted, free of charge, to any person
-diff --git a/m4/ax_compiler_flags_cflags.m4 b/m4/ax_compiler_flags_cflags.m4
-index 31e3ba8c..1dec00b2 100644
---- a/m4/ax_compiler_flags_cflags.m4
-+++ b/m4/ax_compiler_flags_cflags.m4
-@@ -66,12 +66,12 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
-     ])
-     # retpoline: clang-7. Note: requires lld-7 linker support
--    AX_APPEND_COMPILE_FLAGS(["-mretpoline -DRETPOLINE"],
-+    AX_APPEND_COMPILE_FLAGS(["-mretpoline -DRETPOLINE $lt_prog_compiler_pic"],
-         [RETPOLINE_CFLAGS],[$ax_compiler_flags_test])
-     # or the equivalent gcc-7.3 variant
-     if test -z "$RETPOLINE_CFLAGS"; then
-         AX_APPEND_COMPILE_FLAGS(
--          ["-mindirect-branch=thunk-extern -mfunction-return=thunk-extern -mindirect-branch-register -DRETPOLINE"],
-+          ["-mindirect-branch=thunk-extern -mfunction-return=thunk-extern -mindirect-branch-register $lt_prog_compiler_pic -DRETPOLINE"],
-           [RETPOLINE_CFLAGS],[$ax_compiler_flags_test])
-     fi
-diff --git a/m4/ax_compiler_flags_ldflags.m4 b/m4/ax_compiler_flags_ldflags.m4
-index d0287852..193f412e 100644
---- a/m4/ax_compiler_flags_ldflags.m4
-+++ b/m4/ax_compiler_flags_ldflags.m4
-@@ -66,7 +66,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[
-     dnl /usr/bin/ld: warning: -z retpolineplt ignored.
-     case $RETPOLINE_CFLAGS in
-         *-mretpoline*|*-mindirect-branch=thunk-extern*)
--            AX_APPEND_LINK_FLAGS([-Wl,-z,retpolineplt],
-+            AX_APPEND_LINK_FLAGS(["$RETPOLINE_CFLAGS -Wl,-z,retpolineplt"],
-                 [RETPOLINE_LDFLAGS],[$ax_compiler_flags_test])
-             if test -n "$RETPOLINE_LDFLAGS"; then
-                 AM_CFLAGS="$AM_CFLAGS $RETPOLINE_CFLAGS"
diff --git a/package/safeclib/0003-Define-_GNU_SOURCE-when-needed.patch b/package/safeclib/0003-Define-_GNU_SOURCE-when-needed.patch
deleted file mode 100644 (file)
index cc9e580..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-From 94c7b765202fe50894425364834beca79e52b255 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 28 Oct 2019 17:09:43 +0100
-Subject: [PATCH] Define _GNU_SOURCE when needed
-
-Define _GNU_SOURCE to fix build with musl otherwise we'll got the
-following build failures due to localtime_r, strnlen, gmtime_r and
-asctime_r being undefined:
-
-os/localtime_s.c:124:12: error: implicit declaration of function 'localtime_r'; did you mean 'localtime_s'? [-Werror=implicit-function-declaration]
-     dest = localtime_r(timer, dest);
-            ^~~~~~~~~~~
-
-io/gets_s.c:144:32: error: implicit declaration of function 'strnlen'; did you mean 'strlen'? [-Werror=implicit-function-declaration]
-         rsize_t len = (rsize_t)strnlen(dest, dmax);
-                                ^~~~~~~
-                                strlen
-
-An other option would be to define AC_GNU_SOURCE in the configure.ac but
-it seems that there is some handling of _GNU_SOURCE in
-safeclib_private.h
-
-Fixes:
- - http://autobuild.buildroot.net/results/31a4b647ec0dcd9f517f313ec6c7c8f56da1ee47
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/rurban/safeclib/commit/94c7b765202fe50894425364834beca79e52b255]
----
- src/extmem/memzero_s.c | 2 ++
- src/io/gets_s.c        | 2 ++
- src/os/asctime_s.c     | 2 ++
- src/os/ctime_s.c       | 2 ++
- src/os/gmtime_s.c      | 2 ++
- src/os/localtime_s.c   | 2 ++
- 6 files changed, 12 insertions(+)
-
-diff --git a/src/extmem/memzero_s.c b/src/extmem/memzero_s.c
-index 75107215..20cb2784 100644
---- a/src/extmem/memzero_s.c
-+++ b/src/extmem/memzero_s.c
-@@ -31,6 +31,8 @@
-  *------------------------------------------------------------------
-  */
-+#define _GNU_SOURCE
-+
- #ifdef FOR_DOXYGEN
- #include "safe_mem_lib.h"
- #else
-diff --git a/src/io/gets_s.c b/src/io/gets_s.c
-index 09350b3d..be875a1c 100644
---- a/src/io/gets_s.c
-+++ b/src/io/gets_s.c
-@@ -29,6 +29,8 @@
-  *------------------------------------------------------------------
-  */
-+#define _GNU_SOURCE
-+
- #ifdef FOR_DOXYGEN
- #include "safe_lib.h"
- #else
-diff --git a/src/os/asctime_s.c b/src/os/asctime_s.c
-index 42669844..01cefd8f 100644
---- a/src/os/asctime_s.c
-+++ b/src/os/asctime_s.c
-@@ -29,6 +29,8 @@
-  *------------------------------------------------------------------
-  */
-+#define _GNU_SOURCE
-+
- #ifdef FOR_DOXYGEN
- #include "safe_lib.h"
- #else
-diff --git a/src/os/ctime_s.c b/src/os/ctime_s.c
-index 01b31f63..7a1a138c 100644
---- a/src/os/ctime_s.c
-+++ b/src/os/ctime_s.c
-@@ -29,6 +29,8 @@
-  *------------------------------------------------------------------
-  */
-+#define _GNU_SOURCE
-+
- #ifdef FOR_DOXYGEN
- #include "safe_lib.h"
- #else
-diff --git a/src/os/gmtime_s.c b/src/os/gmtime_s.c
-index ff9a0e24..cd8f064f 100644
---- a/src/os/gmtime_s.c
-+++ b/src/os/gmtime_s.c
-@@ -29,6 +29,8 @@
-  *------------------------------------------------------------------
-  */
-+#define _GNU_SOURCE
-+
- #ifdef FOR_DOXYGEN
- #include "safe_lib.h"
- #else
-diff --git a/src/os/localtime_s.c b/src/os/localtime_s.c
-index 0ce3324b..92ea21b9 100644
---- a/src/os/localtime_s.c
-+++ b/src/os/localtime_s.c
-@@ -29,6 +29,8 @@
-  *------------------------------------------------------------------
-  */
-+#define _GNU_SOURCE
-+
- #ifdef FOR_DOXYGEN
- #include "safe_lib.h"
- #else
index af5674da063f84b8843cfbc641ce2547c7fe9cd0..a827855b0880314792be9655aee4c62f4e325e3c 100644 (file)
@@ -1,3 +1,5 @@
-# Locally computed:
-sha256 51f66832853322a4fbe677e196ab4c68317261829edb5e56725ed96a07ea50e6        safeclib-03032018.tar.gz
+# From https://github.com/rurban/safeclib/releases/tag/v17102019
+sha256 b8824429f4281a1fe8cf74ba020e26f4551005c8907f0b6f1e639fee68326159        libsafec-17102019.0-g5d92be.tar.bz2
+
+# Hash for license file
 sha256 c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b        COPYING
index 2dffa7229ad5a1fc795de136686913247cfc051d..726b27f17606bf3a8f4b5beaafe048de8242d6ff 100644 (file)
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-SAFECLIB_VERSION = 03032018
-SAFECLIB_SITE = $(call github,rurban,safeclib,v$(SAFECLIB_VERSION))
+SAFECLIB_VERSION = 17102019
+SAFECLIB_SITE = \
+       https://github.com/rurban/safeclib/releases/download/v$(SAFECLIB_VERSION)
+SAFECLIB_SOURCE = libsafec-$(SAFECLIB_VERSION).0-g5d92be.tar.bz2
 SAFECLIB_LICENSE = MIT
 SAFECLIB_LICENSE_FILES = COPYING
 SAFECLIB_INSTALL_STAGING = YES
-# From git
-SAFECLIB_AUTORECONF = YES
 
 $(eval $(autotools-package))