pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libcanlock: Update to 3.2.0rc2



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Tue May 12 10:48:26 2020 +0200
Changeset:	ffb0238105a427d95265e98bf889a853d9460ff4

Modified Files:
	libcanlock/Makefile
	libcanlock/distinfo
Removed Files:
	libcanlock/TODO
	libcanlock/patches/patch-README
	libcanlock/patches/patch-test_Makefile.am

Log Message:
libcanlock: Update to 3.2.0rc2

Removed patches for README and testsuite (merged upstream).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ffb0238105a427d95265e98bf889a853d9460ff4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libcanlock/Makefile                       |  9 +--------
 libcanlock/TODO                           |  1 -
 libcanlock/distinfo                       | 10 ++++------
 libcanlock/patches/patch-README           | 15 ---------------
 libcanlock/patches/patch-test_Makefile.am | 18 ------------------
 5 files changed, 5 insertions(+), 48 deletions(-)

diffs:
diff --git a/libcanlock/Makefile b/libcanlock/Makefile
index 7a0048d0df..3ed515fa6e 100644
--- a/libcanlock/Makefile
+++ b/libcanlock/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	libcanlock-3.2.0rc1
+DISTNAME=	libcanlock-3.2.0rc2
 CATEGORIES=	news
 MASTER_SITES=	http://micha.freeshell.org/libcanlock/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,9 +15,6 @@ USE_LANGUAGES+=	c99
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
-# For testing patch only, remove for release
-USE_TOOLS+=	autoconf automake
-
 TEST_TARGET=	test
 
 # Recent NetBSD has a namespace clash with its implementation defined extensions
@@ -29,8 +26,4 @@ CONFIGURE_ARGS+=	--with-pkgconfigdir=${PREFIX}/lib/pkgconfig
 # The header parsers are available as a separate package news/canlock-hp
 CONFIGURE_ARGS+=	--disable-hp
 
-# For testing patch only, remove for release
-pre-configure:
-	set -e; cd ${WRKSRC}; autoreconf -v -i -f
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/libcanlock/TODO b/libcanlock/TODO
deleted file mode 100644
index 4e6a29dde1..0000000000
--- a/libcanlock/TODO
+++ /dev/null
@@ -1 +0,0 @@
-[X] Make testsuite work again without exporting all internal symbols.
diff --git a/libcanlock/distinfo b/libcanlock/distinfo
index 984b523df3..fac21f716d 100644
--- a/libcanlock/distinfo
+++ b/libcanlock/distinfo
@@ -1,9 +1,7 @@
 $NetBSD: distinfo,v 1.4 2020/01/07 12:15:13 micha Exp $
 
-SHA1 (libcanlock-3.2.0rc1.tar.bz2) = bb3c554a158d2e2fcd0f36b462c5e347a581e045
-RMD160 (libcanlock-3.2.0rc1.tar.bz2) = 600aae564a98472727e5ecf947fad533535bfaa4
-SHA512 (libcanlock-3.2.0rc1.tar.bz2) = 1584ba1b7ccb50de5f054a5c3b1885b4c898d8cfdfbf094fbf23fbc21b45199abc9d48e780ec393b43c70c87580ee25cf9324c865c18fa89a12fbc3598cc0b7f
-Size (libcanlock-3.2.0rc1.tar.bz2) = 462872 bytes
-SHA1 (patch-README) = fe230a17ac43a5fa58fcd24519c45cb5116822d1
+SHA1 (libcanlock-3.2.0rc2.tar.bz2) = c81abe8a71faa214d04afb4dd888213d2f9109f2
+RMD160 (libcanlock-3.2.0rc2.tar.bz2) = bbe0af5b10b2839b287c80237aecbf3d143b92da
+SHA512 (libcanlock-3.2.0rc2.tar.bz2) = d6f8ae50784387414e342063fac96391f505d94dd2e9c31556dcbd186e070edc3440902ce2b07d0799b1b6d4b21acc4091fbc0eae98ea79a2ee111b7a5a4fdc7
+Size (libcanlock-3.2.0rc2.tar.bz2) = 462798 bytes
 SHA1 (patch-src_secret.c) = c5319326b518bd9de4a4763acdbf3d848a3e238c
-SHA1 (patch-test_Makefile.am) = 55009bd67438c96c6dd023bf60ddb0eb51a56551
diff --git a/libcanlock/patches/patch-README b/libcanlock/patches/patch-README
deleted file mode 100644
index 778cae37d8..0000000000
--- a/libcanlock/patches/patch-README
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-memset_s() corresponds to C11.
-
---- README.orig	2020-04-27 07:54:13.000000000 +0000
-+++ README
-@@ -26,7 +26,7 @@ the exception that 16 bit platforms are 
- For reliable overwriting of secret data in memory, libcanlock needs explicit
- memory access. The following functions are currently supported (automatically
- detected by configure script, if available):
--- memset_s() [available as option in C99 Annex K]
-+- memset_s() [available as option in C11 Annex K]
- - explicit_memset() [available e.g. since NetBSD 7]
- - explicit_bzero() [available e.g. since GNU libc 2.25]
- If none of them can be used, memset() is used as fallback. But a "too smart"
diff --git a/libcanlock/patches/patch-test_Makefile.am b/libcanlock/patches/patch-test_Makefile.am
deleted file mode 100644
index 1e70abddb4..0000000000
--- a/libcanlock/patches/patch-test_Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Link against static library for test of internal functions.
-
---- test/Makefile.am.orig	2019-12-29 16:43:19.000000000 +0000
-+++ test/Makefile.am
-@@ -45,8 +45,10 @@ CLEANFILES = shatest_check.sh
- # This is required because shatest always return 0 status (even if tests failed)
- check_SCRIPTS = shatest_check.sh
- 
-+# Attention: Linking against the static library is intended here!
-+# (The shared library does not export the internal symbols)
- shatest_SOURCES = hkdf.c shatest.c
--shatest_LDADD = ../src/libcanlock.la
-+shatest_LDADD = ../src/.libs/libcanlock.a
- 
- canlocktest_SOURCES = canlocktest.c
- canlocktest_LDADD = ../src/libcanlock.la


Home | Main Index | Thread Index | Old Index