Update libtar to 1.2.20. Use the Arch Linux distfile, as upstream has

mostly disappeared.

Fixes the security issue at http://secunia.com/advisories/55188/.

4 files changed, 15 insertions, 84 deletions

diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile
index bd84fbe2c2b..ae5ba79f88c 100644
--- a/devel/libtar/Makefile
+++ b/devel/libtar/Makefile
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:17:22 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/12/13 18:26:07 bsiegert Exp $
 #
 
-DISTNAME=	libtar-1.2.11
-PKGREVISION=	2
+DISTNAME=	libtar-1.2.20
 CATEGORIES=	devel archivers
-MASTER_SITES=	ftp://ftp.feep.net/pub/software/libtar/
+MASTER_SITES=	http://pkgbuild.com/~giovanni/libtar/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.feep.net/libtar/
+HOMEPAGE=	http://repo.or.cz/w/libtar.git/
 COMMENT=	Library for manipulating POSIX tar files
 
-GNU_CONFIGURE=		YES
+WRKSRC=			${WRKDIR}/libtar
+GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+USE_TOOLS+=		autoconf automake autoreconf gmake
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fvi
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtar/distinfo b/devel/libtar/distinfo
index 87655f55247..cf5ac86899b 100644
--- a/devel/libtar/distinfo
+++ b/devel/libtar/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.9 2015/12/13 18:26:07 bsiegert Exp $
 
-SHA1 (libtar-1.2.11.tar.gz) = 9611f23024b0e89aad1cfea301122186b3c160f8
-RMD160 (libtar-1.2.11.tar.gz) = 205d1213ed32f9708fb2135010afdd9e184c430e
-SHA512 (libtar-1.2.11.tar.gz) = f50edfa5ee164200f0c2636bab5b80628c1007cdf125c06925c173cf98046a24240fab3650566beecfb9252009f54390a6dc3e4a3b1d86e85fa6f3e44f33d8d3
-Size (libtar-1.2.11.tar.gz) = 145354 bytes
+SHA1 (libtar-1.2.20.tar.gz) = 89901d5dbf720b59df7a5f0b34ff90bff9bbb806
+RMD160 (libtar-1.2.20.tar.gz) = 2a27adb42ecf77289bfdc14ca931a6d482f7e975
+SHA512 (libtar-1.2.20.tar.gz) = aa2ba3a1fc90029bb4ba79b1127aaa91f3653ba1f672c52be04556586a5dcd07c52dcaad6939cabf95480966ad7db9a767881db28cc4567da634072ae766ad77
+Size (libtar-1.2.20.tar.gz) = 64640 bytes
 SHA1 (patch-aa) = c07f32034bb5e84b0b90ac5ab322e800036d5fde
-SHA1 (patch-ab) = 881344e3ddcd4a85eadc86e833bcc02c78c89b84
-SHA1 (patch-ac) = 936a26e718d3b16369a00a5997a97c355524c7e4
diff --git a/devel/libtar/patches/patch-ab b/devel/libtar/patches/patch-ab
deleted file mode 100644
index a44b4ede9bb..00000000000
--- a/devel/libtar/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/08/23 08:37:33 bjs Exp $
-
---- lib/Makefile.in.orig	2002-12-15 13:02:30.000000000 -0500
-+++ lib/Makefile.in
-@@ -69,13 +69,15 @@ all: ${ALL}
- .PHONY: clean distclean install
- 
- libtar.a: ${LIBTAR_OBJS} ${LIBOBJS}
--	${AR} rc libtar.a ${LIBTAR_OBJS} ${LIBOBJS}
--	${RANLIB} libtar.a
-+	${LIBTOOL} --mode=link --tag=CC \
-+		${CC} -o libtar.la ${LIBTAR_OBJS:.o=.lo} ${LIBOBJS:.o=.lo} \
-+		${LDFLAGS} -rpath ${PREFIX}/lib -version-info 1:2
- 
- ${LIBTAR_OBJS}: ${LIBTAR_HDRS}
- 
- .c.o:
--	${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<
-+	${LIBTOOL} --mode=compile --tag=CC \
-+		${CC} ${CFLAGS} ${CPPFLAGS} -c -o ${@:.o=.lo} $< -prefer-pic
- 
- clean:
- 	rm -f *~ *.o ${ALL} core
-@@ -85,7 +86,8 @@ distclean: clean
- 
- install: ${ALL}
- 	${MKDIR} ${DESTDIR}${libdir}
--	${INSTALL_DATA} libtar.a ${DESTDIR}${libdir}
-+	${LIBTOOL} --mode=install \
-+		${BSD_INSTALL_LIB} libtar.la ${DESTDIR}${libdir}
- 	${MKDIR} ${DESTDIR}${includedir}
- 	${INSTALL_DATA} ${srcdir}/libtar.h ${DESTDIR}${includedir}
- 	${INSTALL_DATA} ../listhash/libtar_listhash.h ${DESTDIR}${includedir}
diff --git a/devel/libtar/patches/patch-ac b/devel/libtar/patches/patch-ac
deleted file mode 100644
index 36ec419b9fd..00000000000
--- a/devel/libtar/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/08/23 08:37:33 bjs Exp $
-
---- libtar/Makefile.in.orig	2002-12-15 13:02:30.000000000 -0500
-+++ libtar/Makefile.in
-@@ -45,7 +45,7 @@ LIBTAR_HDRS	= ../config.h \
- 		  ${top_srcdir}/compat/compat.h \
- 		  ${top_srcdir}/lib/libtar.h \
- 		  ../listhash/libtar_listhash.h
--LIBTAR_LIBS	= ../lib/libtar.a
-+LIBTAR_LIBS	= ../lib/libtar.la
- ALL		= libtar
- 
- 
-@@ -54,12 +54,15 @@ all: ${ALL}
- .PHONY: clean distclean install
- 
- libtar: ${LIBTAR_OBJS} ${LIBTAR_LIBS} ${LIBTAR_HDRS}
--	${CC} ${CFLAGS} ${LDFLAGS} -o libtar libtar.o ${LIBTAR_LIBS} ${LIBS}
-+	${LIBTOOL} --mode=link --tag=CC \
-+		${CC} ${CFLAGS} ${LDFLAGS} -o libtar libtar.lo \
-+		${LIBTAR_LIBS} ${LIBS}
- 
- ${LIBTAR_OBJS}: ${LIBTAR_HDRS}
- 
- .c.o:
--	${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<
-+	${LIBTOOL} --mode=compile \
-+		${CC} ${CFLAGS} ${CPPFLAGS} -c -o ${@:.o=.lo} $< -prefer-pic
- 
- clean:
- 	rm -f *~ *.o ${ALL} core
-@@ -69,5 +72,5 @@ distclean: clean
- 
- install: ${ALL}
- 	${MKDIR} ${DESTDIR}${bindir}
--	${INSTALL_PROGRAM} libtar ${DESTDIR}${bindir}
-+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} libtar ${DESTDIR}${bindir}
-