openpkg/libarchive.patch

Mon, 17 Sep 2012 19:10:10 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 17 Sep 2012 19:10:10 +0200
changeset 689
9fe04d4d4e5a
parent 428
f880f219c566
permissions
-rw-r--r--

Update to new version of vendor software although Oracle fails to deliver.
More specifically, newer db(3) patch revisions exist but Oracle has
removed them from the canonical download server URI for Berkely DB.

     1 Index: Makefile.in
     2 --- Makefile.in.orig	2011-12-24 19:05:17.000000000 +0100
     3 +++ Makefile.in	2011-12-26 08:30:54.000000000 +0100
     4 @@ -1094,7 +1094,7 @@
     5  lib_LTLIBRARIES = libarchive.la
     6  noinst_LTLIBRARIES = libarchive_fe.la
     7  man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
     8 -BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h
     9 +BUILT_SOURCES =
    10  TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT)
    11  # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
    12  DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
    13 Index: cpio/cmdline.c
    14 --- cpio/cmdline.c.orig	2011-12-24 18:56:24.000000000 +0100
    15 +++ cpio/cmdline.c	2011-12-26 08:29:08.000000000 +0100
    16 @@ -56,7 +56,7 @@
    17  /*
    18   * Long options for cpio.  Please keep this sorted.
    19   */
    20 -static const struct option {
    21 +static const struct libarchive_option {
    22  	const char *name;
    23  	int required;	/* 1 if this option requires an argument */
    24  	int equivalent;	/* Equivalent short option. */
    25 @@ -104,7 +104,7 @@
    26  	static int state = state_start;
    27  	static char *opt_word;
    29 -	const struct option *popt, *match = NULL, *match2 = NULL;
    30 +	const struct libarchive_option *popt, *match = NULL, *match2 = NULL;
    31  	const char *p, *long_prefix = "--";
    32  	size_t optlength;
    33  	int opt = '?';

mercurial