libsigsegv 2.12-1HEADlibsigsegv/2.12-1master

Individual commits lost:

	e09d864 changelog: Release libsigsegv 2.12-1
	9444115 release: New script (copied from gcc-8)
	3295988 copyright: Update
	2049433 libsigsegv.2: Use oh-shlibdeps
	74a1035 libsigsegv-dev: Remove static library
	abc2b1d source.mk: Rewrite/update
	8ba20bb keyring.gpg: Exclude from Git
	a5a1378 control: Update Maintainer
	83037f3 changelog: New upstream version

10 files changed, 54 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index 0ca3797..f6fb633 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,8 @@
 Session.vim
 
 # Source archives
-libsigsegv-*.orig.tar.*
+*-*.orig.tar.*
+keyring.gpg
 
 # Work area
 tmp/
diff --git a/build b/build
index 5f35cd8..334a6c4 100755
--- a/build
+++ b/build
@@ -16,8 +16,10 @@ build: configure
 
 install: build
 	oh-autoinstall
-	# Remove GNU Libtool archive files.
+	# Remove static library and GNU Libtool archive.
+	rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libsigsegv.a
 	rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libsigsegv.la
 	oh-fixperms
 	oh-strip
 	oh-installfiles
+	oh-shlibdeps
diff --git a/changelog b/changelog
index 545fdff..7851cf5 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libsigsegv (2.12-1) trunk
+
+  * New upstream version.
+  * Update Maintainer.
+  * libsigsegv-dev: Remove static library.
+  * libsigsegv.2: Use automatic shared library dependencies.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sun, 23 Jun 2019 12:54:08 -0400
+
 libsigsegv (2.10-1) trunk
 
   * Initial release.
diff --git a/control b/control
index 4676fe3..91242a2 100644
--- a/control
+++ b/control
@@ -1,3 +1,3 @@
-Maintainer: "P. J. McDermott" <pj@pehjota.net>
-Build-Depends: opkhelper-3.0
+Maintainer: Patrick McDermott <patrick.mcdermott@libiquity.com>
+Build-Depends: opkbuild (>= 4.0.1), opkhelper-3.0 (>= 3.1.2), gpg, dirmngr
 Homepage: https://www.gnu.org/software/libsigsegv/
diff --git a/copyright b/copyright
index d207fa9..611b8fd 100644
--- a/copyright
+++ b/copyright
@@ -1,9 +1,9 @@
 Upstream Source
 ===============
 
-Copyright (C) 2002-2009  Bruno Haible <bruno@clisp.org>
-Copyright (C) 2002-2003  Paolo Bonzini <bonzini@gnu.org>
-Copyright (C) 2009-2010  Eric Blake <ebb9@byu.net>
+Copyright (C) 1993-1999, 2002-2018  Bruno Haible <bruno@clisp.org>
+Copyright (C) 2002-2003, 2006  Paolo Bonzini <bonzini@gnu.org>
+Copyright (C) 2009  Eric Blake <ebb9@byu.net>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,6 +22,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 On this system, a copy of the GNU General Public License may be found at
 <file:///usr/share/common-licenses/GPL-2>.
 
+src/fault-linux-m68k-old.c, src/fault-macosdarwin5-powerpc.c,
+src/fault-macosdarwin7-powerpc.c, src/fault-netbsd-alpha.c
+-------------------------------------------------------------
 
 Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
 Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
@@ -41,7 +44,7 @@ modified is included with the above copyright notice.
 Distribution Packaging
 ======================
 
-Copyright (C) 2013 Patrick "P. J." McDermott
+Copyright (C) 2013, 2019  Patrick McDermott
 
 These files may be reproduced, distributed, modified, and otherwise dealt in
 under the terms of the Expat License.
diff --git a/keyring.gpg b/keyring.gpg
deleted file mode 100644
index c028cbe..0000000
--- a/keyring.gpg
+++ /dev/null
diff --git a/libsigsegv-dev.pkg/files b/libsigsegv-dev.pkg/files
index 6c92586..e0db29b 100644
--- a/libsigsegv-dev.pkg/files
+++ b/libsigsegv-dev.pkg/files
@@ -1,3 +1,2 @@
 /usr/include/
-/usr/lib/*/libsigsegv.a
 /usr/lib/*/libsigsegv.so
diff --git a/libsigsegv.2.pkg/control b/libsigsegv.2.pkg/control
index 6fa171d..271d96b 100644
--- a/libsigsegv.2.pkg/control
+++ b/libsigsegv.2.pkg/control
@@ -1,4 +1,5 @@
 Architecture: any
 Platform: all
+Depends: ${Shlib-Depends}
 Description: Library for handling page faults in user mode
  ${Common-Description}
diff --git a/release b/release
new file mode 100755
index 0000000..871cb4a
--- /dev/null
+++ b/release
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -eu
+
+read src ver <<-EOF
+	$(sed '1s/^\(.*\) (\(.*\)) .*$/\1 \2/; q;' changelog)
+	EOF
+
+sed '/^ -- .*  /{ s/^\( -- .*  \).*$/\1'"$(LC_ALL='POSIX' date \
+	'+%a, %d %b %Y %H:%M:%S %z')"'/; :l; n; b l; };' changelog >changelog~
+mv changelog~ changelog
+git commit -m "changelog: Release ${src} ${ver}" -- changelog
+git tag "${src}/${ver}" HEAD
diff --git a/source.mk b/source.mk
index f527bbe..abcd3a1 100644
--- a/source.mk
+++ b/source.mk
@@ -1,18 +1,23 @@
-upstream_archive = libsigsegv-$(OPK_SOURCE_VERSION_UPSTREAM).tar.gz
-upstream_url = http://ftp.gnu.org/pub/gnu/libsigsegv/$(upstream_archive)
-source_archive = ../libsigsegv-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.gz
-keys = F059B1D1
+upstream_archive = $(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).tar.gz
+upstream_url = http://ftp.gnu.org/pub/gnu/$(OPK_SOURCE)/$(upstream_archive)
+source_archive = ../$(OPK_SOURCE)-$(OPK_SOURCE_VERSION_UPSTREAM).orig.tar.gz
+
+gpg = GNUPGHOME=gnupghome/ gpg --no-default-keyring --keyring ../keyring.gpg
+keys = \
+	'68D9 4D8A AEEA D48A E7DC  5B90 4F49 4A94 2E46 16C2'
 
 $(source_archive):
-	wget '$(upstream_url)'
-	set -e; if gpg --version >/dev/null 2>&1; then \
-		wget '$(upstream_url).sig'; \
-		[ -e ../keyring.gpg ] || \
-			gpg --keyring ../keyring.gpg --no-default-keyring \
-				--recv-keys $(keys) || true; \
-		gpg --verify --keyring ../keyring.gpg \
-			'$(upstream_archive).sig'; \
+	wget -c '$(upstream_url)' '$(upstream_url).sig'
+	install -m 0700 -d gnupghome/
+	[ -e ../keyring.gpg ] || \
+		$(gpg) --keyserver hkp://pool.sks-keyservers.net \
+			--recv-keys $(keys); \
+	rm -f ../keyring.gpg~; \
+	if ! $(gpg) --verify '$(upstream_archive).sig'; then \
+		rm -Rf gnupghome/; \
+		exit 1; \
 	fi
+	rm -Rf gnupghome/
 	mv '$(upstream_archive)' '$(source_archive)'
 
 source: $(source_archive)