[libtar] update to 1.2.20 (latest upstream release)

Kamil Dudka kdudka at fedoraproject.org
Thu Oct 10 12:19:52 UTC 2013


commit e592649b4339b6dd08978a238fab8434bad70842
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Thu Oct 10 14:06:59 2013 +0200

    update to 1.2.20 (latest upstream release)

 .gitignore                                         |    1 +
 libtar-1.2.11-CVE-2013-4397.patch                  |   98 ------------------
 libtar-1.2.11-bz729009.patch                       |    2 +-
 libtar-1.2.11-bz785760.patch                       |    4 +-
 libtar-1.2.11-mem-deref.patch                      |    2 +-
 libtar-1.2.11-missing-protos.patch                 |   46 --------
 libtar-1.2.11-tar_header.patch                     |   15 ---
 ...emleak.patch => libtar-1.2.20-fix-memleak.patch |  109 ++++++++++----------
 libtar-macro.patch                                 |    4 +-
 libtar.spec                                        |   35 ++----
 sources                                            |    3 +-
 11 files changed, 76 insertions(+), 243 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e7a5ae7..092c66f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libtar-1.2.11.tar.gz
 libtar_1.2.11-4.diff.gz
+/0907a9034eaf2a57e8e4a9439f793f3f05d446cd.tar.gz
diff --git a/libtar-1.2.11-bz729009.patch b/libtar-1.2.11-bz729009.patch
index a73eabc..2adfce3 100644
--- a/libtar-1.2.11-bz729009.patch
+++ b/libtar-1.2.11-bz729009.patch
@@ -11,7 +11,7 @@ diff --git a/libtar/Makefile.in b/libtar/Makefile.in
 index 4e7bca4..94bd198 100644
 --- a/libtar/Makefile.in
 +++ b/libtar/Makefile.in
-@@ -17,7 +17,7 @@ PACKAGE_VERSION	= @PACKAGE_VERSION@
+@@ -20,7 +20,7 @@ SHELL           = @SHELL@
  
  ### Installation programs and flags
  INSTALL		= @INSTALL@
diff --git a/libtar-1.2.11-bz785760.patch b/libtar-1.2.11-bz785760.patch
index c76197c..04f24ec 100644
--- a/libtar-1.2.11-bz785760.patch
+++ b/libtar-1.2.11-bz785760.patch
@@ -58,7 +58,7 @@ diff --git a/lib/extract.c b/lib/extract.c
 index 8993b95..086f3d5 100644
 --- a/lib/extract.c
 +++ b/lib/extract.c
-@@ -245,6 +245,7 @@ tar_extract_regfile(TAR *t, char *realname)
+@@ -238,6 +238,7 @@ tar_extract_regfile(TAR *t, char *realname)
  		{
  			if (k != -1)
  				errno = EINVAL;
@@ -66,7 +66,7 @@ index 8993b95..086f3d5 100644
  			free (pn);
  			return -1;
  		}
-@@ -253,6 +254,7 @@ tar_extract_regfile(TAR *t, char *realname)
+@@ -246,6 +247,7 @@ tar_extract_regfile(TAR *t, char *realname)
  		if (write(fdout, buf,
  			  ((i > T_BLOCKSIZE) ? T_BLOCKSIZE : i)) == -1)
  		{
diff --git a/libtar-1.2.11-mem-deref.patch b/libtar-1.2.11-mem-deref.patch
index 9b89bf8..8a618a0 100644
--- a/libtar-1.2.11-mem-deref.patch
+++ b/libtar-1.2.11-mem-deref.patch
@@ -10,7 +10,7 @@
  			 || S_ISFIFO((mode_t)oct_to_int((t)->th_buf.mode)))
 --- libtar-1.2.11/lib/util.c.deref	2003-01-07 02:41:00.000000000 +0100
 +++ libtar-1.2.11/lib/util.c	2009-12-30 17:35:51.860121660 +0100
-@@ -133,9 +133,7 @@ oct_to_int(char *oct)
+@@ -148,9 +148,7 @@ oct_to_int(char *oct)
  {
  	int i;
  
diff --git a/libtar-1.2.11-missing-protos.patch b/libtar-1.2.11-missing-protos.patch
index 1a61087..8a65c2a 100644
--- a/libtar-1.2.11-missing-protos.patch
+++ b/libtar-1.2.11-missing-protos.patch
@@ -10,52 +10,6 @@ diff -up libtar-1.2.11/lib/append.c.foo libtar-1.2.11/lib/append.c
  #include <errno.h>
  #include <fcntl.h>
  #include <sys/param.h>
-diff -up libtar-1.2.11/configure.foo libtar-1.2.11/configure
---- libtar-1.2.11/configure.foo	2008-04-03 15:08:07.000000000 +0200
-+++ libtar-1.2.11/configure	2008-04-03 15:09:20.000000000 +0200
-@@ -4943,8 +4943,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -20083,8 +20083,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return (2);
-+  return (0);
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -22411,6 +22411,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- #include <stdio.h>
-+#include <string.h>
- 
- typedef struct {
-   int length;
-@@ -22437,10 +22438,10 @@ int main() {
-     if ((snprintf(test1, tests[i].length, "%s", tests[i].test)
-          != tests[i].retval) ||
-         (tests[i].result && strcmp(tests[i].result, test1)))
--      exit(1);
-+      return (1);
-   }
- 
--  exit(0);
-+  return (0);
- }
- 
- _ACEOF
 diff -up libtar-1.2.11/lib/output.c~ libtar-1.2.11/lib/output.c
 --- libtar-1.2.11/lib/output.c~	2008-04-03 15:11:07.000000000 +0200
 +++ libtar-1.2.11/lib/output.c	2008-04-03 15:11:07.000000000 +0200
diff --git a/libtar-1.2.11-fix-memleak.patch b/libtar-1.2.20-fix-memleak.patch
similarity index 78%
rename from libtar-1.2.11-fix-memleak.patch
rename to libtar-1.2.20-fix-memleak.patch
index 505e461..c0c2be4 100644
--- a/libtar-1.2.11-fix-memleak.patch
+++ b/libtar-1.2.20-fix-memleak.patch
@@ -1,16 +1,22 @@
+From ad1840ad2fbf10f27aae4cf31c49d8631952a2a4 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Thu, 10 Oct 2013 13:14:36 +0200
+Subject: [PATCH] libtar-1.2.11-fix-memleak.patch rebased for 1.2.20
+
+---
  lib/decode.c    |    2 +-
  lib/extract.c   |   94 +++++++++++++++++++++++++++++++++++++++++++------------
  lib/handle.c    |    1 +
- lib/wrapper.c   |   12 ++++++-
+ lib/wrapper.c   |   11 ++++++
  libtar/libtar.c |   30 +++++++++++------
- 5 files changed, 106 insertions(+), 33 deletions(-)
+ 5 files changed, 106 insertions(+), 32 deletions(-)
 
 diff --git a/lib/decode.c b/lib/decode.c
-index 794c868..c2c2baa 100644
+index c16ea2d..8a9abeb 100644
 --- a/lib/decode.c
 +++ b/lib/decode.c
 @@ -29,7 +29,7 @@ th_get_pathname(TAR *t)
- 	char filename[MAXPATHLEN];
+ 	static TLS_THREAD char filename[MAXPATHLEN];
  
  	if (t->th_buf.gnu_longname)
 -		return t->th_buf.gnu_longname;
@@ -19,10 +25,10 @@ index 794c868..c2c2baa 100644
  	if (t->th_buf.prefix[0] != '\0')
  	{
 diff --git a/lib/extract.c b/lib/extract.c
-index cacfe58..8993b95 100644
+index 36357e7..9bb9e00 100644
 --- a/lib/extract.c
 +++ b/lib/extract.c
-@@ -44,9 +44,10 @@ tar_set_file_perms(TAR *t, char *realname)
+@@ -36,9 +36,10 @@ tar_set_file_perms(TAR *t, char *realname)
  	uid_t uid;
  	gid_t gid;
  	struct utimbuf ut;
@@ -35,7 +41,7 @@ index cacfe58..8993b95 100644
  	mode = th_get_mode(t);
  	uid = th_get_uid(t);
  	gid = th_get_gid(t);
-@@ -69,6 +70,7 @@ tar_set_file_perms(TAR *t, char *realname)
+@@ -61,6 +62,7 @@ tar_set_file_perms(TAR *t, char *realname)
  				filename, uid, gid, strerror(errno));
  # endif
  #endif /* HAVE_LCHOWN */
@@ -43,7 +49,7 @@ index cacfe58..8993b95 100644
  			return -1;
  		}
  
-@@ -78,6 +80,7 @@ tar_set_file_perms(TAR *t, char *realname)
+@@ -70,6 +72,7 @@ tar_set_file_perms(TAR *t, char *realname)
  #ifdef DEBUG
  		perror("utime()");
  #endif
@@ -51,7 +57,7 @@ index cacfe58..8993b95 100644
  		return -1;
  	}
  
-@@ -87,9 +90,11 @@ tar_set_file_perms(TAR *t, char *realname)
+@@ -79,9 +82,11 @@ tar_set_file_perms(TAR *t, char *realname)
  #ifdef DEBUG
  		perror("chmod()");
  #endif
@@ -63,7 +69,7 @@ index cacfe58..8993b95 100644
  	return 0;
  }
  
-@@ -168,7 +173,7 @@ tar_extract_regfile(TAR *t, char *realname)
+@@ -161,7 +166,7 @@ tar_extract_regfile(TAR *t, char *realname)
  	int fdout;
  	int i, k;
  	char buf[T_BLOCKSIZE];
@@ -72,7 +78,7 @@ index cacfe58..8993b95 100644
  
  #ifdef DEBUG
  	printf("==> tar_extract_regfile(t=0x%lx, realname=\"%s\")\n", t,
-@@ -181,14 +186,18 @@ tar_extract_regfile(TAR *t, char *realname)
+@@ -174,14 +179,18 @@ tar_extract_regfile(TAR *t, char *realname)
  		return -1;
  	}
  
@@ -92,7 +98,7 @@ index cacfe58..8993b95 100644
  
  #ifdef DEBUG
  	printf("  ==> extracting: %s (mode %04o, uid %d, gid %d, %d bytes)\n",
-@@ -204,6 +213,7 @@ tar_extract_regfile(TAR *t, char *realname)
+@@ -197,6 +206,7 @@ tar_extract_regfile(TAR *t, char *realname)
  #ifdef DEBUG
  		perror("open()");
  #endif
@@ -100,7 +106,7 @@ index cacfe58..8993b95 100644
  		return -1;
  	}
  
-@@ -235,23 +245,30 @@ tar_extract_regfile(TAR *t, char *realname)
+@@ -228,23 +238,30 @@ tar_extract_regfile(TAR *t, char *realname)
  		{
  			if (k != -1)
  				errno = EINVAL;
@@ -132,16 +138,16 @@ index cacfe58..8993b95 100644
  	return 0;
  }
  
-@@ -290,7 +307,7 @@ tar_skip_regfile(TAR *t)
+@@ -283,7 +300,7 @@ tar_skip_regfile(TAR *t)
  int
  tar_extract_hardlink(TAR * t, char *realname)
  {
 -	char *filename;
 +	char *filename,*pn;
  	char *linktgt = NULL;
- 	linkname_t *lnp;
+ 	char *lnp;
  	libtar_hashptr_t hp;
-@@ -301,9 +318,13 @@ tar_extract_hardlink(TAR * t, char *realname)
+@@ -294,9 +311,13 @@ tar_extract_hardlink(TAR * t, char *realname)
  		return -1;
  	}
  
@@ -156,7 +162,7 @@ index cacfe58..8993b95 100644
  	libtar_hashptr_reset(&hp);
  	if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t),
  			       (libtar_matchfunc_t)libtar_str_match) != 0)
-@@ -322,9 +343,11 @@ tar_extract_hardlink(TAR * t, char *realname)
+@@ -315,9 +336,11 @@ tar_extract_hardlink(TAR * t, char *realname)
  #ifdef DEBUG
  		perror("link()");
  #endif
@@ -168,7 +174,7 @@ index cacfe58..8993b95 100644
  	return 0;
  }
  
-@@ -333,7 +356,7 @@ tar_extract_hardlink(TAR * t, char *realname)
+@@ -326,7 +349,7 @@ tar_extract_hardlink(TAR * t, char *realname)
  int
  tar_extract_symlink(TAR *t, char *realname)
  {
@@ -177,7 +183,7 @@ index cacfe58..8993b95 100644
  
  	if (!TH_ISSYM(t))
  	{
-@@ -341,9 +364,13 @@ tar_extract_symlink(TAR *t, char *realname)
+@@ -334,9 +357,13 @@ tar_extract_symlink(TAR *t, char *realname)
  		return -1;
  	}
  
@@ -192,7 +198,7 @@ index cacfe58..8993b95 100644
  
  	if (unlink(filename) == -1 && errno != ENOENT)
  		return -1;
-@@ -357,9 +384,11 @@ tar_extract_symlink(TAR *t, char *realname)
+@@ -350,9 +377,11 @@ tar_extract_symlink(TAR *t, char *realname)
  #ifdef DEBUG
  		perror("symlink()");
  #endif
@@ -204,7 +210,7 @@ index cacfe58..8993b95 100644
  	return 0;
  }
  
-@@ -370,7 +399,7 @@ tar_extract_chardev(TAR *t, char *realname)
+@@ -363,7 +392,7 @@ tar_extract_chardev(TAR *t, char *realname)
  {
  	mode_t mode;
  	unsigned long devmaj, devmin;
@@ -213,7 +219,7 @@ index cacfe58..8993b95 100644
  
  	if (!TH_ISCHR(t))
  	{
-@@ -378,14 +407,18 @@ tar_extract_chardev(TAR *t, char *realname)
+@@ -371,14 +400,18 @@ tar_extract_chardev(TAR *t, char *realname)
  		return -1;
  	}
  
@@ -234,7 +240,7 @@ index cacfe58..8993b95 100644
  #ifdef DEBUG
  	printf("  ==> extracting: %s (character device %ld,%ld)\n",
  	       filename, devmaj, devmin);
-@@ -396,9 +429,11 @@ tar_extract_chardev(TAR *t, char *realname)
+@@ -389,9 +422,11 @@ tar_extract_chardev(TAR *t, char *realname)
  #ifdef DEBUG
  		perror("mknod()");
  #endif
@@ -246,7 +252,7 @@ index cacfe58..8993b95 100644
  	return 0;
  }
  
-@@ -409,7 +444,7 @@ tar_extract_blockdev(TAR *t, char *realname)
+@@ -402,7 +437,7 @@ tar_extract_blockdev(TAR *t, char *realname)
  {
  	mode_t mode;
  	unsigned long devmaj, devmin;
@@ -255,7 +261,7 @@ index cacfe58..8993b95 100644
  
  	if (!TH_ISBLK(t))
  	{
-@@ -417,13 +452,17 @@ tar_extract_blockdev(TAR *t, char *realname)
+@@ -410,13 +445,17 @@ tar_extract_blockdev(TAR *t, char *realname)
  		return -1;
  	}
  
@@ -274,7 +280,7 @@ index cacfe58..8993b95 100644
  
  #ifdef DEBUG
  	printf("  ==> extracting: %s (block device %ld,%ld)\n",
-@@ -435,9 +474,11 @@ tar_extract_blockdev(TAR *t, char *realname)
+@@ -428,9 +467,11 @@ tar_extract_blockdev(TAR *t, char *realname)
  #ifdef DEBUG
  		perror("mknod()");
  #endif
@@ -286,7 +292,7 @@ index cacfe58..8993b95 100644
  	return 0;
  }
  
-@@ -447,19 +488,22 @@ int
+@@ -440,19 +481,22 @@ int
  tar_extract_dir(TAR *t, char *realname)
  {
  	mode_t mode;
@@ -312,7 +318,7 @@ index cacfe58..8993b95 100644
  
  #ifdef DEBUG
  	printf("  ==> extracting: %s (mode %04o, directory)\n", filename,
-@@ -474,6 +518,7 @@ tar_extract_dir(TAR *t, char *realname)
+@@ -467,6 +511,7 @@ tar_extract_dir(TAR *t, char *realname)
  #ifdef DEBUG
  				perror("chmod()");
  #endif
@@ -320,7 +326,7 @@ index cacfe58..8993b95 100644
  				return -1;
  			}
  			else
-@@ -481,6 +526,7 @@ tar_extract_dir(TAR *t, char *realname)
+@@ -474,6 +519,7 @@ tar_extract_dir(TAR *t, char *realname)
  #ifdef DEBUG
  				puts("  *** using existing directory");
  #endif
@@ -328,7 +334,7 @@ index cacfe58..8993b95 100644
  				return 1;
  			}
  		}
-@@ -489,10 +535,12 @@ tar_extract_dir(TAR *t, char *realname)
+@@ -482,10 +528,12 @@ tar_extract_dir(TAR *t, char *realname)
  #ifdef DEBUG
  			perror("mkdir()");
  #endif
@@ -342,7 +348,7 @@ index cacfe58..8993b95 100644
  	return 0;
  }
  
-@@ -502,7 +550,7 @@ int
+@@ -495,7 +543,7 @@ int
  tar_extract_fifo(TAR *t, char *realname)
  {
  	mode_t mode;
@@ -351,7 +357,7 @@ index cacfe58..8993b95 100644
  
  	if (!TH_ISFIFO(t))
  	{
-@@ -510,11 +558,15 @@ tar_extract_fifo(TAR *t, char *realname)
+@@ -503,11 +551,15 @@ tar_extract_fifo(TAR *t, char *realname)
  		return -1;
  	}
  
@@ -368,7 +374,7 @@ index cacfe58..8993b95 100644
  
  #ifdef DEBUG
  	printf("  ==> extracting: %s (fifo)\n", filename);
-@@ -524,9 +576,11 @@ tar_extract_fifo(TAR *t, char *realname)
+@@ -517,9 +569,11 @@ tar_extract_fifo(TAR *t, char *realname)
  #ifdef DEBUG
  		perror("mkfifo()");
  #endif
@@ -381,10 +387,10 @@ index cacfe58..8993b95 100644
  }
  
 diff --git a/lib/handle.c b/lib/handle.c
-index ae974b9..e3a48cb 100644
+index 33a262c..002d23c 100644
 --- a/lib/handle.c
 +++ b/lib/handle.c
-@@ -82,6 +82,7 @@ tar_open(TAR **t, char *pathname, tartype_t *type,
+@@ -82,6 +82,7 @@ tar_open(TAR **t, const char *pathname, tartype_t *type,
  	(*t)->fd = (*((*t)->type->openfunc))(pathname, oflags, mode);
  	if ((*t)->fd == -1)
  	{
@@ -393,7 +399,7 @@ index ae974b9..e3a48cb 100644
  		return -1;
  	}
 diff --git a/lib/wrapper.c b/lib/wrapper.c
-index 51d5086..e60a530 100644
+index 44cc435..46fabdb 100644
 --- a/lib/wrapper.c
 +++ b/lib/wrapper.c
 @@ -36,7 +36,10 @@ tar_extract_glob(TAR *t, char *globname, char *prefix)
@@ -410,35 +416,29 @@ index 51d5086..e60a530 100644
 @@ -46,7 +49,11 @@ tar_extract_glob(TAR *t, char *globname, char *prefix)
  		else
  			strlcpy(buf, filename, sizeof(buf));
- 		if (tar_extract_file(t, filename) != 0)
-+		{
-+			free (filename);
+ 		if (tar_extract_file(t, buf) != 0)
++    {
++      free(filename);
  			return -1;
-+		}
-+		free (filename);
++    }
++    free(filename);
  	}
  
  	return (i == 1 ? 0 : -1);
-@@ -77,13 +84,16 @@ tar_extract_all(TAR *t, char *prefix)
- 			snprintf(buf, sizeof(buf), "%s/%s", prefix, filename);
- 		else
- 			strlcpy(buf, filename, sizeof(buf));
--		free(filename);
- #ifdef DEBUG
- 		printf("    tar_extract_all(): calling tar_extract_file(t, "
+@@ -82,7 +89,11 @@ tar_extract_all(TAR *t, char *prefix)
  		       "\"%s\")\n", buf);
  #endif
  		if (tar_extract_file(t, buf) != 0)
-+		{
-+			free (filename);
++    {
++      free(filename);
  			return -1;
-+		}
-+		free (filename);
++    }
++    free(filename);
  	}
  
  	return (i == 1 ? 0 : -1);
 diff --git a/libtar/libtar.c b/libtar/libtar.c
-index a6cef72..f06c5b8 100644
+index 9fa92b2..12984ee 100644
 --- a/libtar/libtar.c
 +++ b/libtar/libtar.c
 @@ -249,7 +249,9 @@ extract(char *tarfile, char *rootdir)
@@ -544,3 +544,6 @@ index a6cef72..f06c5b8 100644
  }
  
  
+-- 
+1.7.1
+
diff --git a/libtar-macro.patch b/libtar-macro.patch
index 8a2c448..683767b 100644
--- a/libtar-macro.patch
+++ b/libtar-macro.patch
@@ -5,8 +5,8 @@
 --- libtar-1.2.11/configure.ac.macro	2009-09-22 14:47:07.000000000 +0200
 +++ libtar-1.2.11/configure.ac	2009-09-22 14:50:34.000000000 +0200
 @@ -2,6 +2,7 @@
- AC_INIT([libtar], [1.2.11])
- AC_PREREQ([2.57])
+ AC_INIT([libtar], [1.2.20])
+ AC_PREREQ([2.61])
  AC_CONFIG_AUX_DIR([autoconf])
 +AC_CONFIG_MACRO_DIR([autoconf])
  AC_CONFIG_HEADERS([config.h])
diff --git a/libtar.spec b/libtar.spec
index e523965..68d5b56 100644
--- a/libtar.spec
+++ b/libtar.spec
@@ -1,20 +1,17 @@
 Summary:        Tar file manipulation API
 Name:           libtar
-Version:        1.2.11
-Release:        28%{?dist}
+Version:        1.2.20
+Release:        1%{?dist}
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.feep.net/libtar/
-Source0:        ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz
-Patch0:         http://ftp.debian.org/debian/pool/main/libt/libtar/libtar_1.2.11-4.diff.gz
+Source0:        http://repo.or.cz/w/libtar.git/snapshot/0907a9034eaf2a57e8e4a9439f793f3f05d446cd.tar.gz
 Patch1:         libtar-1.2.11-missing-protos.patch
 Patch2:         libtar-macro.patch
-Patch3:         libtar-1.2.11-tar_header.patch
 Patch4:         libtar-1.2.11-mem-deref.patch
-Patch5:         libtar-1.2.11-fix-memleak.patch
+Patch5:         libtar-1.2.20-fix-memleak.patch
 Patch6:         libtar-1.2.11-bz729009.patch
 Patch7:         libtar-1.2.11-bz785760.patch
-Patch8:         libtar-1.2.11-CVE-2013-4397.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  zlib-devel libtool
 
@@ -35,34 +32,23 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q
-%patch0 -p1 -z .deb
+%setup -q -n %{name}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .tar_header
-%patch4 -p1 -b .deref
-%patch5 -p1 -b .fixmem
+%patch4 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 # set correct version for .so build
 %global ltversion %(echo %{version} | tr '.' ':')
 sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
   lib/Makefile.in
-# sanitize the macro definitions so that aclocal can find them:
-cd autoconf
-sed '/^m4_include/d;s/ m4_include/ m4][_include/g' aclocal.m4 >psg.m4
-rm acsite.m4 aclocal.m4
-cd ..
+
+autoreconf -iv
 
 
 %build
-cp -p /usr/share/libtool/config/config.sub autoconf
-# config.guess is not needed, macro %%configure specifies --build
-libtoolize --copy
-aclocal -I autoconf
-autoconf
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -91,6 +77,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Thu Oct 10 2013 Kamil Dudka <kdudka at redhat.com> - 1.2.20-1
+- update to 1.2.20 (latest upstream release)
+
 * Thu Oct 10 2013 Kamil Dudka <kdudka at redhat.com> - 1.2.11-28
 - fix CVE-2013-4397: buffer overflows by expanding a specially-crafted archive
 
diff --git a/sources b/sources
index 743e3e4..44b1674 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-604238e8734ce6e25347a58c4f1a1d7e  libtar-1.2.11.tar.gz
-8149a09f4baef9a879ef5f74dab1c32e  libtar_1.2.11-4.diff.gz
+01c445a35f9ede888cc6621948ac7df0  0907a9034eaf2a57e8e4a9439f793f3f05d446cd.tar.gz


More information about the scm-commits mailing list