system/man-db: [PD] bump, fix license

2 files changed, 30 insertions, 39 deletions

diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD
index a645b2b7e..a719c6a2d 100644
--- a/system/man-db/APKBUILD
+++ b/system/man-db/APKBUILD
@@ -1,20 +1,18 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=man-db
-pkgver=2.7.6.1
-pkgrel=2
+pkgver=2.8.3
+pkgrel=0
 pkgdesc="The man command and related utilities for examining on-line help files"
 url="http://www.nongnu.org/man-db/"
 arch="all"
-license="GPL-2+"
+license="GPL-2.0+"
 depends="groff less"
-makedepends_host="db-dev gettext-dev libpipeline-dev zlib-dev"
-subpackages="$pkgname-doc"
-[ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang"
+makedepends_host="db-dev libpipeline-dev zlib-dev"
+subpackages="$pkgname-doc $pkgname-lang"
 options="!check"  # requires //IGNORE in iconv
 source="http://download.savannah.nongnu.org/releases/man-db/man-db-$pkgver.tar.xz
-	man-db.trigger
-	man-db-2.7.5-iconv.patch"
+	man-db-2.8.3-iconv.patch"
 triggers="man-db.trigger=/usr/share/man"
 
 build() {
@@ -45,6 +43,5 @@ package() {
 	rm -r "${pkgdir}"/usr/lib/tmpfiles.d  # systemd
 }
 
-sha512sums="623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301  man-db-2.7.6.1.tar.xz
-0d2ab0b42888178ffb83c5dd5eaac8005f047de56af55eb3046291318fd8ed8c4999a4ea0148367ea07c0a0490eb8b9bc726a03b46533ef51bec6a5747719b64  man-db.trigger
-bdf53b2868eb0652f8ca5bec340736a1923b52921bc1a33bde691f005be937f0a01dd32ff46d04ba956aa9c05b2cf276a03877de6c5fd1d997c4a5b029f330e2  man-db-2.7.5-iconv.patch"
+sha512sums="35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745  man-db-2.8.3.tar.xz
+4bc9efaafa30dedb6da9d2a62436cf570bef5603b98494ca3c565c3e338b57a481ed40af2312a20cd9f64f965fc0c45607403d829339700c57f9dc0022d7c6ed  man-db-2.8.3-iconv.patch"
diff --git a/system/man-db/man-db-2.7.5-iconv.patch b/system/man-db/man-db-2.8.3-iconv.patch
index 24fea8872..98f10cb2a 100644
--- a/system/man-db/man-db-2.7.5-iconv.patch
+++ b/system/man-db/man-db-2.8.3-iconv.patch
@@ -1,24 +1,24 @@
-diff --git man-db-2.7.5/src/man.c man-db-fixed/src/man.c
-index bea684f..df5f5cb 100644
---- man-db-2.7.5/src/man.c
-+++ man-db-fixed/src/man.c
-@@ -1503,11 +1503,9 @@ static void add_output_iconv (pipeline *p,
+--- man-db-2.8.3/src/man.c	2018-06-18 22:44:35.672743065 -0500
++++ man-db-2.8.3/src/man.c	2018-06-18 22:46:35.032624890 -0500
+@@ -1569,15 +1569,13 @@
  {
  	debug ("add_output_iconv: source %s, target %s\n", source, target);
  	if (source && target && !STREQ (source, target)) {
 -		char *target_translit = xasprintf ("%s//TRANSLIT", target);
- 		pipeline_command_args (p, "iconv", "-c",
--				       "-f", source, "-t", target_translit,
-+				       "-f", source, "-t", target,
- 				       NULL);
+ 		pipecmd *iconv_cmd;
+ 		iconv_cmd = pipecmd_new_args
+-			("iconv", "-c", "-f", source, "-t", target_translit,
++			("iconv", "-c", "-f", source, "-t", target,
+ 			 NULL);
+ 		pipecmd_pre_exec (iconv_cmd, sandbox_load, sandbox_free,
+ 				  sandbox);
+ 		pipeline_command (p, iconv_cmd);
 -		free (target_translit);
  	}
  }
  
-diff --git man-db-2.7.5/src/manconv.c man-db-fixed/src/manconv.c
-index cae9b67..48b7a81 100644
---- man-db-2.7.5/src/manconv.c
-+++ man-db-fixed/src/manconv.c
+--- man-db-2.8.3/src/manconv.c
++++ man-db-2.8.3/src/manconv.c
 @@ -106,10 +106,9 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
  	static char *utf8 = NULL, *output = NULL;
  	size_t utf8left = 0;
@@ -33,11 +33,9 @@ index cae9b67..48b7a81 100644
  	int ret = 0;
  
  	debug ("trying encoding %s -> %s\n", try_from_code, try_to_code);
-diff --git man-db-2.7.5/src/manconv_client.c man-db-fixed/src/manconv_client.c
-index 2949c75..7805f90 100644
---- man-db-2.7.5/src/manconv_client.c
-+++ man-db-fixed/src/manconv_client.c
-@@ -131,7 +131,7 @@ void add_manconv (pipeline *p, const char *source, const char *target)
+--- man-db-2.8.3/src/manconv_client.c
++++ man-db-2.8.3/src/manconv_client.c
+@@ -105,7 +105,7 @@ void add_manconv (pipeline *p, const char *source, const char *target)
  		codes->from[2] = NULL;
  		name = appendstr (name, "UTF-8:", source, NULL);
  	}
@@ -46,11 +44,9 @@ index 2949c75..7805f90 100644
  	/* informational only; no shell quoting concerns */
  	name = appendstr (name, " -t ", codes->to, NULL);
  	if (quiet >= 2)
-diff --git man-db-2.7.5/src/manconv_main.c man-db-fixed/src/manconv_main.c
-index 166a2b8..4e700e9 100644
---- man-db-2.7.5/src/manconv_main.c
-+++ man-db-fixed/src/manconv_main.c
-@@ -105,9 +105,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
+--- man-db-2.8.3/src/manconv_main.c
++++ man-db-2.8.3/src/manconv_main.c
+@@ -107,9 +107,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
  			return 0;
  		case 't':
  			to_code = xstrdup (arg);
@@ -60,11 +56,9 @@ index 166a2b8..4e700e9 100644
  			return 0;
  		case 'd':
  			debug_level = 1;
-diff --git man-db-2.7.5/src/whatis.c man-db-fixed/src/whatis.c
-index 39aa093..0a25c92 100644
---- man-db-2.7.5/src/whatis.c
-+++ man-db-fixed/src/whatis.c
-@@ -948,7 +948,7 @@ int main (int argc, char *argv[])
+--- man-db-2.8.3/src/whatis.c
++++ man-db-2.8.3/src/whatis.c
+@@ -968,7 +968,7 @@ int main (int argc, char *argv[])
  	display_seen = hashtable_create (&null_hashtable_free);
  
  #ifdef HAVE_ICONV