From b0b3468b956ae478cc8c79f972bdbcce38bb3893 Mon Sep 17 00:00:00 2001
From: Scott Garman <sgarman@zenlinux.com>
Date: Fri, 23 Jul 2010 12:08:28 -0700
Subject: [PATCH] tar: New recipe additions 1.17 and 1.23

* tar 1.23 is GPLv3
* tar 1.17 is latest GPLv2

Recipes and patches dervied from OpenEmbedded and Debian

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../packages/tar/tar-1.17/gcc43build.patch    | 35 +++++++++++++++++++
 .../packages/tar/tar-1.17/m4extensions.patch  | 28 +++++++++++++++
 meta-lsb/packages/tar/tar.inc                 | 25 +++++++++++++
 meta-lsb/packages/tar/tar_1.17.bb             | 13 +++++++
 meta-lsb/packages/tar/tar_1.23.bb             |  9 +++++
 5 files changed, 110 insertions(+)
 create mode 100644 meta-lsb/packages/tar/tar-1.17/gcc43build.patch
 create mode 100644 meta-lsb/packages/tar/tar-1.17/m4extensions.patch
 create mode 100644 meta-lsb/packages/tar/tar.inc
 create mode 100644 meta-lsb/packages/tar/tar_1.17.bb
 create mode 100644 meta-lsb/packages/tar/tar_1.23.bb

diff --git a/meta-lsb/packages/tar/tar-1.17/gcc43build.patch b/meta-lsb/packages/tar/tar-1.17/gcc43build.patch
new file mode 100644
index 0000000000..cc5f0e13d0
--- /dev/null
+++ b/meta-lsb/packages/tar/tar-1.17/gcc43build.patch
@@ -0,0 +1,35 @@
+# Fix errors when built with gcc 4.3
+# Patch taken from Debian bug #452096
+
+diff -urN tar-1.17.orig/lib/argp-fmtstream.h tar-1.17/lib/argp-fmtstream.h
+--- tar-1.17.orig/lib/argp-fmtstream.h	2006-01-11 12:24:05.000000000 -0800
++++ tar-1.17/lib/argp-fmtstream.h	2010-07-22 22:36:12.000000000 -0700
+@@ -198,7 +198,11 @@
+ #endif
+ 
+ #ifndef ARGP_FS_EI
+-#define ARGP_FS_EI extern inline
++ #if defined __GNUC_STDC_INLINE__
++   #define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
++ #else
++   #define ARGP_FS_EI extern inline
++ #endif
+ #endif
+ 
+ ARGP_FS_EI size_t
+diff -urN tar-1.17.orig/lib/argp.h tar-1.17/lib/argp.h
+--- tar-1.17.orig/lib/argp.h	2007-03-30 00:09:11.000000000 -0700
++++ tar-1.17/lib/argp.h	2010-07-22 22:38:44.000000000 -0700
+@@ -580,7 +580,11 @@
+ # endif
+ 
+ # ifndef ARGP_EI
+-#  define ARGP_EI extern __inline__
++#  if defined __GNUC_STDC_INLINE__
++#    define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
++#  else
++#    define ARGP_EI extern __inline__
++#  endif
+ # endif
+ 
+ ARGP_EI void
diff --git a/meta-lsb/packages/tar/tar-1.17/m4extensions.patch b/meta-lsb/packages/tar/tar-1.17/m4extensions.patch
new file mode 100644
index 0000000000..11b981aa92
--- /dev/null
+++ b/meta-lsb/packages/tar/tar-1.17/m4extensions.patch
@@ -0,0 +1,28 @@
+# Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
+# This is needed to configure correctly with newer versions of autoconf.
+
+--- tar-1.17/m4/extensions.m4.orig	2010-07-22 22:21:35.000000000 -0700
++++ tar-1.17/m4/extensions.m4	2010-07-22 22:23:41.000000000 -0700
+@@ -1,4 +1,4 @@
+-# serial 4  -*- Autoconf -*-
++# serial 5  -*- Autoconf -*-
+ # Enable extensions on systems that normally disable them.
+ 
+ # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+@@ -16,6 +16,7 @@
+ # ------------------------
+ # Enable extensions on systems that normally disable them,
+ # typically due to standards-conformance issues.
++m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
+ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+ [
+   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+@@ -48,7 +49,7 @@
+     AC_DEFINE([__EXTENSIONS__])
+   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+   AC_DEFINE([_TANDEM_SOURCE])
+-])
++])])
+ 
+ # gl_USE_SYSTEM_EXTENSIONS
+ # ------------------------
diff --git a/meta-lsb/packages/tar/tar.inc b/meta-lsb/packages/tar/tar.inc
new file mode 100644
index 0000000000..cf72d4893b
--- /dev/null
+++ b/meta-lsb/packages/tar/tar.inc
@@ -0,0 +1,25 @@
+DESCRIPTION = "GNU tar saves many files together into a single tape \
+or disk archive, and can restore individual files from the archive."
+HOMEPAGE = "http://www.gnu.org/software/tar/"
+SECTION = "base"
+
+SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
+
+inherit autotools gettext
+
+do_install () {
+    autotools_do_install
+    install -d ${D}${base_bindir}
+    mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
+    mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
+}
+
+pkg_postinst_${PN} () {
+    update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
+    update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+    update-alternatives --remove tar tar.${PN}
+    update-alternatives --remove rmt rmt.${PN}
+}
diff --git a/meta-lsb/packages/tar/tar_1.17.bb b/meta-lsb/packages/tar/tar_1.17.bb
new file mode 100644
index 0000000000..be74542091
--- /dev/null
+++ b/meta-lsb/packages/tar/tar_1.17.bb
@@ -0,0 +1,13 @@
+require tar.inc
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+PR = "r0"
+
+SRC_URI += "file://m4extensions.patch \
+    file://gcc43build.patch \
+    "
+
+SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
+SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492"
diff --git a/meta-lsb/packages/tar/tar_1.23.bb b/meta-lsb/packages/tar/tar_1.23.bb
new file mode 100644
index 0000000000..093c0b43ce
--- /dev/null
+++ b/meta-lsb/packages/tar/tar_1.23.bb
@@ -0,0 +1,9 @@
+require tar.inc
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e"
+SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36"