From 149e6ca2875c21d473e66faab5623d2914a31458 Mon Sep 17 00:00:00 2001
From: Christian Wiese <christian.wiese@securepoint.de>
Date: Wed, 14 Jul 2010 11:12:40 +0200
Subject: [PATCH] cpio: Updated (2.8 -> 2.11)

Note:
This commit is also slightly improving the cpio to detect if tar
package is installed. In that case the built-in rmt command will
be disabled using the rmt shipped with the tar package.
---
 archiver/cpio/cpio.conf    |  7 +++++++
 archiver/cpio/cpio.desc    |  6 +++---
 archiver/cpio/no_rmt.patch | 29 -----------------------------
 3 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 archiver/cpio/no_rmt.patch

diff --git a/archiver/cpio/cpio.conf b/archiver/cpio/cpio.conf
index 31cced394..55c80b921 100644
--- a/archiver/cpio/cpio.conf
+++ b/archiver/cpio/cpio.conf
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../cpio/cpio.conf
+# Copyright (C) 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -13,3 +14,9 @@
 # --- SDE-COPYRIGHT-NOTE-END ---
 
 [ $prefix = usr ] && bindir=/bin
+
+if pkginstalled tar; then
+	pkgprefix -t tar
+	echo_status "Disabling built-in rmt command (using $(pkgprefix sbindir tar)/rmt from tar)"
+	var_append extraconfopt ' ' "--with-rmt=$(pkgprefix sbindir tar)/rmt"
+fi
diff --git a/archiver/cpio/cpio.desc b/archiver/cpio/cpio.desc
index af6062f0c..3244d0c73 100644
--- a/archiver/cpio/cpio.desc
+++ b/archiver/cpio/cpio.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../cpio/cpio.desc
-[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -34,8 +34,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.8
+[V] 2.11
 [P] X ?----5---9 102.050
 
-[D] 2894495944 cpio-2.8.tar.gz ftp://ftp.gnu.org/pub/gnu/cpio/
+[D] 3726184006 cpio-2.11.tar.gz ftp://ftp.gnu.org/pub/gnu/cpio/
 
diff --git a/archiver/cpio/no_rmt.patch b/archiver/cpio/no_rmt.patch
deleted file mode 100644
index 20384d204..000000000
--- a/archiver/cpio/no_rmt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../cpio/no_rmt.patch
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-rmt is installed by tar too, and we will prefer that
--mnemoc
-
---- ./Makefile.in.orig	2004-12-28 23:06:53.000000000 -0300
-+++ ./Makefile.in	2004-12-28 23:07:06.000000000 -0300
-@@ -217,7 +217,7 @@
- target_alias = @target_alias@
- ACLOCAL_AMFLAGS = -I m4
- AUTOMAKE_OPTIONS = gnits 1.8 dist-bzip2 std-options
--SUBDIRS = doc headers lib rmt src po tests
-+SUBDIRS = doc headers lib src po tests
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-