summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2015-05-10 18:50:47 +0000
committerbsiegert <bsiegert>2015-05-10 18:50:47 +0000
commita8967da0165734566db28d1dff87eadc164fb841 (patch)
tree31346ca5aaaddfc843053c7b6254b110f5987b5c /archivers
parent4266ca6c37ded5c3200f063328d60f166f872539 (diff)
downloadpkgsrc-a8967da0165734566db28d1dff87eadc164fb841.tar.gz
Add a patch to fix build on Darwin. From Jonathan Buschmann in PR pkg/49857.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/arj/Makefile3
-rw-r--r--archivers/arj/distinfo3
-rw-r--r--archivers/arj/patches/patch-msgbind.c15
3 files changed, 19 insertions, 2 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index ead213c5ff7..0253332f0d6 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/04/12 16:09:27 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2015/05/10 18:50:47 bsiegert Exp $
DISTNAME= arj-3.10.22
PKGREVISION= 2
@@ -8,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arj/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://arj.sourceforge.net/
COMMENT= Open-source ARJ archiver
+LICENSE= gnu-gpl-v2
MAKE_JOBS_SAFE= no
diff --git a/archivers/arj/distinfo b/archivers/arj/distinfo
index 03cca3ad562..95347cca8a5 100644
--- a/archivers/arj/distinfo
+++ b/archivers/arj/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2015/04/18 12:39:05 rodent Exp $
+$NetBSD: distinfo,v 1.22 2015/05/10 18:50:47 bsiegert Exp $
SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
@@ -15,6 +15,7 @@ SHA1 (patch-gnu_config.h.in) = 2cf609a6c7cb4e32441a433db3dc9cc04c23ae2a
SHA1 (patch-gnu_configure.in) = 062f3dc1eee6f009dfdfa432bb3c138a9c28a829
SHA1 (patch-gnu_makefile.in) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
SHA1 (patch-integr.c) = fade32219b21ac3382028bf23ee4171d8d095b5f
+SHA1 (patch-msgbind.c) = fa395b0b8b74f4b430a870254a1aa1554f2bb8e7
SHA1 (patch-register.c) = 8d81e663b499a45f7faa52b16a6cee47394cd09c
SHA1 (patch-resource_resource.txt) = ea7044dc8a6e4fed213f00f8db9f6c1ab5df6f72
SHA1 (patch-uxspec.c) = 24a22fa2822704e620b38df12b76ef88fe908863
diff --git a/archivers/arj/patches/patch-msgbind.c b/archivers/arj/patches/patch-msgbind.c
new file mode 100644
index 00000000000..57ef4c25fb5
--- /dev/null
+++ b/archivers/arj/patches/patch-msgbind.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-msgbind.c,v 1.1 2015/05/10 18:50:47 bsiegert Exp $
+
+Fix overlap string copy
+
+--- msgbind.c.orig 2015-04-25 16:26:29.000000000 +0000
++++ msgbind.c
+@@ -578,7 +578,7 @@ int main(int argc, char **argv)
+ }
+ strcat(pool[tpool].data, msgname);
+ strcat(pool[tpool].data, ", ");
+- strcpy(msg_buffer, msg_buffer+1);
++ memmove(msg_buffer, msg_buffer+1, strlen(msg_buffer));
+ buf_len=strlen(msg_buffer);
+ msg_buffer[--buf_len]='\0';
+ patch_string(msg_buffer);