package/trousers: bump version to 0.3.14

PATCH New Bernd Kuhls 2 participants 2 messages Aug 20, 2018

Share & tools

Bernd Kuhls

author

2018-08-20 05:47 UTC #0 lore raw

PATCH 1/1 package/trousers: bump version to 0.3.14

Removed patches 0001 & 0003, applied upstream.
Rebased patches 0002 & 0004 and renumbered them.
Added sha256 hashes for tarball and license file.

Signed-off-by Bernd Kuhls <[email protected]>

---
 ...r-understands-pie-and-relro-options.patch} | 17 ++--
 ...-inline-for-read_data-and-write_data.patch | 94 -------------------
 ...went_r-is-available-before-using-it.patch} |  8 +-
 ...m-include-limits.h-to-fix-musl-build.patch | 29 ------
 package/trousers/trousers.hash                |  9 +-
 package/trousers/trousers.mk                  |  2 +-
 6 files changed, 20 insertions(+), 139 deletions(-)
 rename package/trousers/{0002-Check-if-the-compiler-understands-pie-and-relro-options.patch => 0001-Check-if-the-compiler-understands-pie-and-relro-options.patch} (97%)
 delete mode 100644 package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch
 rename package/trousers/{0004-Check-that-getpwent_r-is-available-before-using-it.patch => 0002-Check-that-getpwent_r-is-available-before-using-it.patch} (93%)
 delete mode 100644 package/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch

package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch renamed from package/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch +8 -9

similarity index 97%
rename from package/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch
rename to package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch
index 3275b76a2c..b1179eb4aa 100644
@@ -8,8 +8,10 @@ executables, and -Wl,-z,relro turns on read-only relocation support in gcc.
 Add checks to ensure that the compiler and linker understand these options.
 
 Signed-off-by: Lada Trimasova <[email protected]>
+[Bernd: Rebased for version 0.3.14]
+Signed-off-by: Bernd Kuhls <[email protected]>
 ---
- configure.in                |  5 +++
+ configure.ac                |  5 +++
  m4/ax_check_compile_flag.m4 | 72 ++++++++++++++++++++++++++++++++++++
  m4/ax_check_link_flag.m4    | 71 +++++++++++++++++++++++++++++++++++
  src/tcsd/Makefile.am        |  4 +-

@@ -19,12 +21,12 @@ Signed-off-by: Lada Trimasova <[email protected]>
 
 diff --git a/configure.in b/configure.in
 index add23dc..9603353 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -12,6 +12,7 @@ TSS_VER_MINOR=3
  # compute $target
  AC_CANONICAL_TARGET
- AM_INIT_AUTOMAKE([foreign 1.6])
+ AM_INIT_AUTOMAKE([foreign subdir-objects 1.6])
 +AC_CONFIG_MACRO_DIR([m4])
  
  # Debugging support

@@ -205,11 +207,8 @@ index 2210734..6640ab2 100644
 -tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE
 +tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include $(PIE_CFLAGS)
  tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@
--tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now
+-tcsd_LDFLAGS=@TCSD_LDFLAGS@
 +tcsd_LDFLAGS=$(PIE_LDFLAGS) $(RELRO_LDFLAGS)
- 
  tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c
  
--- 
-2.5.0
-
+ if TSS_BUILD_PS

package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch deleted +0 ~~-94~~

94 lines not on this page · raw message

package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch renamed from package/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch +5 -3

similarity index 93%
rename from package/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch
rename to package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch
index 7014ad7afb..ab2418c7c5 100644
@@ -6,15 +6,17 @@ Subject: [PATCH] Check that getpwent_r is available before using it
 This fixes building trousers with musl
 
 Signed-off-by: No? Rubinstein <[email protected]>
+[Bernd: Rebased for version 0.3.14]
+Signed-off-by: Bernd Kuhls <[email protected]>
 ---
- configure.in        |  4 ++++
+ configure.ac        |  4 ++++
  src/tspi/ps/tspps.c | 10 +++++-----
  2 files changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/configure.in b/configure.in
 index fd3f5f1..e3d7acf 100644
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -145,6 +145,10 @@ else
  	AC_MSG_ERROR(["gtk", "openssl" and "none" are the only supported gui options for trousers])
  fi

package/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch deleted +0 ~~-29~~

deleted file mode 100644
index f88e47ac27..0000000000
@@ -1,29 +0,0 @@
-From 66bbe0a87818a1e3c721780dc33b2d81fdf4a774 Mon Sep 17 00:00:00 2001
-From: Romain Naour <[email protected]>
-Date: Sun, 21 Aug 2016 23:32:10 +0200
-Subject: [PATCH] tsp_tcsi_param: include limits.h to fix musl build
-
-The musl libc doesn't provide <bits/local_lim.h>, use <limits.h>
-instead.
-
-Signed-off-by: Romain Naour <[email protected]>
----
- src/tspi/tsp_tcsi_param.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tspi/tsp_tcsi_param.c b/src/tspi/tsp_tcsi_param.c
-index 670f86f..8f2b4e4 100644
---- a/src/tspi/tsp_tcsi_param.c
-+++ b/src/tspi/tsp_tcsi_param.c
-@@ -11,7 +11,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
--#include <bits/local_lim.h>
-+#include <limits.h>
- #include "trousers/tss.h"
- #include "trousers/trousers.h"
- #include "trousers_types.h"
--- 
-2.5.5
-

package/trousers/trousers.hash +6 -3

index 997cfa97c1..20c65c450e 100644
@@ -1,3 +1,6 @@
-# http://sourceforge.net/projects/trousers/files/trousers/0.3.13/
-sha1 d23f1a3df4febffc4174f5cca7d1c54230477bb2 trousers-0.3.13.tar.gz
-md5  ad508f97b406f6e48cd90e85d78e7ca8         trousers-0.3.13.tar.gz
+# http://sourceforge.net/projects/trousers/files/trousers/0.3.14/
+sha1 9ca2cc9e1179465f6c5d9055e2b855e25031b85a trousers-0.3.14.tar.gz
+md5  4a476b4f036dd20a764fb54fc24edbec         trousers-0.3.14.tar.gz
+# Locally computed
+sha256 ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47  trousers-0.3.14.tar.gz
+sha256 1ad596d12e7471549663c03e280b5b5d084a2e853fb86e4d766109818f9d7dae  LICENSE

package/trousers/trousers.mk +1 -1

index e49c2ac141..1d5364959c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TROUSERS_VERSION = 0.3.13
+TROUSERS_VERSION = 0.3.14
 TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION)
 TROUSERS_LICENSE = BSD-3-Clause
 TROUSERS_LICENSE_FILES = LICENSE

Signature · 1 line

2.18.0

Thomas Petazzoni

Applied

2018-08-20 21:06 UTC #1 lore raw

PATCH 1/1 package/trousers: bump version to 0.3.14

Hello,

Quoted 5 lines · Bernd Kuhls

Removed patches 0001 & 0003, applied upstream.
Rebased patches 0002 & 0004 and renumbered them.
Added sha256 hashes for tarball and license file.
Signed-off-by Bernd Kuhls <[email protected]>

Quoted 12 lines

---
 ...r-understands-pie-and-relro-options.patch} | 17 ++--
 ...-inline-for-read_data-and-write_data.patch | 94 -------------------
 ...went_r-is-available-before-using-it.patch} |  8 +-
 ...m-include-limits.h-to-fix-musl-build.patch | 29 ------
 package/trousers/trousers.hash                |  9 +-
 package/trousers/trousers.mk                  |  2 +-
 6 files changed, 20 insertions(+), 139 deletions(-)
 rename package/trousers/{0002-Check-if-the-compiler-understands-pie-and-relro-options.patch => 0001-Check-if-the-compiler-understands-pie-and-relro-options.patch} (97%)
 delete mode 100644 package/trousers/0001-Remove-inline-for-read_data-and-write_data.patch
 rename package/trousers/{0004-Check-that-getpwent_r-is-available-before-using-it.patch => 0002-Check-that-getpwent_r-is-available-before-using-it.patch} (93%)
 delete mode 100644 package/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch

Applied to next, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com