commit c296792b0207a02108df34390e671a2125a5b597
Author: Marcin Krol <h...@tld-linux.org>
Date: Thu Apr 25 20:51:34 2024 +0200
- fixes from Debian
0001-Fixes-segmentation-fault-on-ia64.patch | 21 +++++
...-Fixes-alignment-errors-on-hppa-and-sparc.patch | 98 ++++++++++++++++++++++
0003-fix-bashisms.patch | 22 +++++
0004-fix-machine-alignment.patch | 26 ++++++
0005-disable-builtin-expat.patch | 61 ++++++++++++++
0006-tar-preserve.patch | 26 ++++++
0007-fix-some-includes.patch | 45 ++++++++++
0008-fix-spelling.patch | 35 ++++++++
0009-Remove-rpath-from-libneon.patch | 80 ++++++++++++++++++
0010-add-missing-include.patch | 23 +++++
...ed-comment-in-tla-doc-handbook-index.html.patch | 22 +++++
...date-tla-tree-list-to-point-to-tla-add-id.patch | 25 ++++++
0013-fix-libneon-configure-options.patch | 38 +++++++++
0014-do-not-show-the-build-date.patch | 16 ++++
0015-changeset-fd-leak.patch | 15 ++++
tla-neon.patch | 2 +-
tla.spec | 40 ++++++++-
17 files changed, 590 insertions(+), 5 deletions(-)
---
diff --git a/tla.spec b/tla.spec
index 7cb12c0..cc105e4 100644
--- a/tla.spec
+++ b/tla.spec
@@ -2,14 +2,29 @@ Summary: tla arch - revision control system
Summary(pl.UTF-8): tla arch - system kontroli wersji
Name: tla
Version: 1.3.5
-Release: 11
+Release: 12
Epoch: 1
License: GPL v2
Group: Development/Version Control
Source0: http://ftp.gnu.org/gnu/gnu-arch/%{name}-%{version}.tar.gz
# Source0-md5: db31ee89bc4788eef1eba1cee6c176ef
-Patch0: %{name}-neon.patch
-Patch1: libtool-tag.patch
+Patch1: 0001-Fixes-segmentation-fault-on-ia64.patch
+Patch2: 0002-Fixes-alignment-errors-on-hppa-and-sparc.patch
+Patch3: 0003-fix-bashisms.patch
+Patch4: 0004-fix-machine-alignment.patch
+Patch5: 0005-disable-builtin-expat.patch
+Patch6: 0006-tar-preserve.patch
+Patch7: 0007-fix-some-includes.patch
+Patch8: 0008-fix-spelling.patch
+Patch9: 0009-Remove-rpath-from-libneon.patch
+Patch10: 0010-add-missing-include.patch
+Patch11: 0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch
+Patch12: 0012-update-tla-tree-list-to-point-to-tla-add-id.patch
+Patch13: 0013-fix-libneon-configure-options.patch
+Patch14: 0014-do-not-show-the-build-date.patch
+Patch15: 0015-changeset-fd-leak.patch
+Patch20: %{name}-neon.patch
+Patch21: libtool-tag.patch
URL: http://www.gnu.org/software/gnu-arch/
BuildRequires: libtool
BuildRequires: neon-devel
@@ -40,8 +55,25 @@ arch w wersji tla to wersja w C wzorcowych idei arch.
%prep
%setup -q
-%patch0 -p1
+# Patches from Debian
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+# Other patches
+%patch20 -p1
+%patch21 -p1
rm -rf src/libneon src/expat
diff --git a/0001-Fixes-segmentation-fault-on-ia64.patch
b/0001-Fixes-segmentation-fault-on-ia64.patch
new file mode 100644
index 0000000..d83b6f7
--- /dev/null
+++ b/0001-Fixes-segmentation-fault-on-ia64.patch
@@ -0,0 +1,21 @@
+From: Martín Ferrari <martin.ferr...@gmail.com>
+Date: Mon, 28 Aug 2006 07:02:15 +0200
+Subject: Fixes segmentation fault on ia64.
+
+Bug-Debian: http://bugs.debian.org/382465
+---
+ src/tla/libarch/invent.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/tla/libarch/invent.c b/src/tla/libarch/invent.c
+index 077d776..168e04c 100644
+--- a/src/tla/libarch/invent.c
++++ b/src/tla/libarch/invent.c
+@@ -16,6 +16,7 @@
+ #include "hackerlab/arrays/ar.h"
+ #include "hackerlab/fs/file-names.h"
+ #include "hackerlab/vu/safe.h"
++#include "tla/libarch/cmdutils.h"
+ #include "tla/libarch/inode-sig.h"
+ #include "tla/libarch/inv-ids.h"
+ #include "tla/libarch/invent.h"
diff --git a/0002-Fixes-alignment-errors-on-hppa-and-sparc.patch
b/0002-Fixes-alignment-errors-on-hppa-and-sparc.patch
new file mode 100644
index 0000000..6a90e68
--- /dev/null
+++ b/0002-Fixes-alignment-errors-on-hppa-and-sparc.patch
@@ -0,0 +1,98 @@
+From: Martín Ferrari <martin.ferr...@gmail.com>
+Date: Mon, 28 Aug 2006 07:06:06 +0200
+Subject: Fixes alignment errors on hppa and sparc.
+
+Bug-Debian: http://bugs.debian.org/382465
+---
+ src/hackerlab/hash/sha1.c | 25 ++++++++++++++++---------
+ 1 files changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/src/hackerlab/hash/sha1.c b/src/hackerlab/hash/sha1.c
+index 47a7352..00556d4 100644
+--- a/src/hackerlab/hash/sha1.c
++++ b/src/hackerlab/hash/sha1.c
+@@ -39,11 +39,11 @@ struct sha1_context
+
+ t_uint32 total[2];
+ t_uint32 buflen;
+- t_uchar buffer[128];
++ t_uchar buffer[128] __attribute__((aligned(4)));
+ };
+
+ static void
+-sha1_process_blocks (const void *buffer, size_t len, sha1_context_t ctx);
++sha1_process_blocks (const t_uchar *buffer, size_t len, sha1_context_t ctx);
+
+ #if MACHINE_IS_BIGENDIAN
+ # define NOTSWAP(n) (n)
+@@ -124,7 +124,7 @@ sha1_scan (sha1_context_t ctx, const t_uchar *buffer,
size_t len)
+ {
+ /* When we already have some bits in our internal buffer concatenate
+ both inputs first. */
+- if (ctx->buflen != 0)
++ while (len > 0)
+ {
+ size_t left_over = ctx->buflen;
+ size_t add = 128 - left_over > len ? len : 128 - left_over;
+@@ -147,14 +147,17 @@ sha1_scan (sha1_context_t ctx, const t_uchar *buffer,
size_t len)
+ }
+
+ /* Process available complete blocks. */
++ /*
+ if (len >= 64)
+ {
+ sha1_process_blocks (buffer, len & ~63, ctx);
+ buffer = (const t_uchar *) buffer + (len & ~63);
+ len &= 63;
+ }
++ */
+
+ /* Move remaining bytes in internal buffer. */
++ /*
+ if (len > 0)
+ {
+ size_t left_over = ctx->buflen;
+@@ -169,6 +172,7 @@ sha1_scan (sha1_context_t ctx, const t_uchar *buffer,
size_t len)
+ }
+ ctx->buflen = left_over;
+ }
++ */
+ }
+
+
+@@ -191,6 +195,8 @@ sha1_final (t_uchar *result, sha1_context_t ctx)
+ /* Take yet unprocessed bytes into account. */
+ t_uint32 bytes = ctx->buflen;
+ size_t pad;
++ /* Temporary array for solving alignment issues */
++ t_uint32 tmp[5];
+
+ /* Now count remaining bytes. */
+ ctx->total[0] += bytes;
+@@ -208,11 +214,12 @@ sha1_final (t_uchar *result, sha1_context_t ctx)
+ /* Process last bytes. */
+ sha1_process_blocks (ctx->buffer, bytes + pad + 8, ctx);
+
+- ((t_uint32 *) result)[0] = NOTSWAP (ctx->current_sha1.A);
+- ((t_uint32 *) result)[1] = NOTSWAP (ctx->current_sha1.B);
+- ((t_uint32 *) result)[2] = NOTSWAP (ctx->current_sha1.C);
+- ((t_uint32 *) result)[3] = NOTSWAP (ctx->current_sha1.D);
+- ((t_uint32 *) result)[4] = NOTSWAP (ctx->current_sha1.E);
++ tmp[0] = NOTSWAP (ctx->current_sha1.A);
++ tmp[1] = NOTSWAP (ctx->current_sha1.B);
++ tmp[2] = NOTSWAP (ctx->current_sha1.C);
++ tmp[3] = NOTSWAP (ctx->current_sha1.D);
++ tmp[4] = NOTSWAP (ctx->current_sha1.E);
++ mem_cpy (result, tmp, 20);
+
+ sha1_context_reset (ctx);
+ }
+@@ -329,7 +336,7 @@ sha1_from_ascii (sha1_t * out, t_uchar const * ascii)
+ It is assumed that LEN % 64 == 0.
+ Most of this code comes from GnuPG's cipher/sha1.c. */
+ static void
+-sha1_process_blocks (const void *buffer, size_t len, sha1_context_t ctx)
++sha1_process_blocks (const t_uchar *buffer, size_t len, sha1_context_t ctx)
+ {
+ const t_uint32 *words = buffer;
+ size_t nwords = len / sizeof (t_uint32);
diff --git a/0003-fix-bashisms.patch b/0003-fix-bashisms.patch
new file mode 100644
index 0000000..097fe3b
--- /dev/null
+++ b/0003-fix-bashisms.patch
@@ -0,0 +1,22 @@
+From: Barry deFreese <bddeb...@comcast.net>
+Date: Fri, 7 Mar 2008 10:40:50 -0500
+Subject: fix bashisms
+
+use printf instead of echo -e.
+---
+ src/tla/tests/test-import.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/tla/tests/test-import.sh b/src/tla/tests/test-import.sh
+index 8682fb1..0847c00 100644
+--- a/src/tla/tests/test-import.sh
++++ b/src/tla/tests/test-import.sh
+@@ -24,7 +24,7 @@ tla init-tree --nested
j...@example.com--2003/hello-world--mainline--1.0
+ tla id-tagging-method explicit
+ tla add-id hello-world.c README
+ tla import -L 'initial import'
+-test "$(tla categories -A j...@example.com--2003)" = "$(echo -e
cat\\ncow\\nhello-world)"
++test "$(tla categories -A j...@example.com--2003)" = "$(printf
cat\\ncow\\nhello-world\\n)"
+ test "$(tla branches j...@example.com--2003/hello-world)" =
"hello-world--mainline"
+ test "$(tla versions j...@example.com--2003/hello-world--mainline)" =
"hello-world--mainline--1.0"
+ test -d $(tla whereis-archive
j...@example.com--2003)/hello-world/hello-world--mainline/hello-world--mainline--1.0/base-0
diff --git a/0004-fix-machine-alignment.patch b/0004-fix-machine-alignment.patch
new file mode 100644
index 0000000..08579f2
--- /dev/null
+++ b/0004-fix-machine-alignment.patch
@@ -0,0 +1,26 @@
+From: Adam Majer <ad...@zombino.com>
+Date: Wed, 23 Jul 2008 11:26:32 -0500
+Subject: fix machine alignment
+
+As per upstream comments in https://bugzilla.redhat.com/show_bug.cgi?id=182742
+the invariant test should be removed.
+
+Bug-Debian: http://bugs.debian.org/491373
+Bug: https://bugzilla.redhat.com/show_bug.cgi?id=182742
+---
+ src/hackerlab/tests/arrays-tests/unit-ar.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/hackerlab/tests/arrays-tests/unit-ar.c
b/src/hackerlab/tests/arrays-tests/unit-ar.c
+index f08ed99..982e052 100644
+--- a/src/hackerlab/tests/arrays-tests/unit-ar.c
++++ b/src/hackerlab/tests/arrays-tests/unit-ar.c
+@@ -50,7 +50,7 @@ static void
+ check_array (size_t size, unsigned long * ar)
+ {
+ int x;
+- invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1)));
++ /* invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); */
+ invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar)));
+ for (x = 0; x < size; ++x)
+ invariant (ar[x] == HASH_INDEX (x));
diff --git a/0005-disable-builtin-expat.patch b/0005-disable-builtin-expat.patch
new file mode 100644
index 0000000..65f2536
--- /dev/null
+++ b/0005-disable-builtin-expat.patch
@@ -0,0 +1,61 @@
+From: Sylvain Beucler <b...@beuc.net>
+Date: Mon, 14 Dec 2009 17:27:55 +0100
+Subject: disable builtin expat
+
+Fixes CVE-2009-3560 and CVE-2009-3720 denial-of-services
+
+Bug-Debian: http://bugs.debian.org/560940
+---
+ src/libneon/Makefile.in | 2 +-
+ src/libneon/src/Makefile.in | 6 +++---
+ src/tla/tla/Makefile.in | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/libneon/Makefile.in b/src/libneon/Makefile.in
+index f05110d..da89ddb 100644
+--- a/src/libneon/Makefile.in
++++ b/src/libneon/Makefile.in
+@@ -33,7 +33,7 @@ VPATH = @srcdir@
+
+ @SET_MAKE@
+
+-LDFLAGS = -L. -L$(top_builddir)/../expat @LDFLAGS@
++LDFLAGS = -L. @LDFLAGS@
+ LIBS = @LIBS@
+ CC = @CC@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff --git a/src/libneon/src/Makefile.in b/src/libneon/src/Makefile.in
+index e3c61e5..aff1fca 100644
+--- a/src/libneon/src/Makefile.in
++++ b/src/libneon/src/Makefile.in
+@@ -25,14 +25,14 @@ LIBTOOL = @LIBTOOL@
+
+ # Flags
+ CPPFLAGS = @DEFS@ @CPPFLAGS@
+-CFLAGS = @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)/../expat/lib
@NEON_CFLAGS@
+-LDFLAGS = -L$(top_builddir)/../expat @LDFLAGS@
++CFLAGS = @CFLAGS@ -I$(top_builddir) @NEON_CFLAGS@
++LDFLAGS = @LDFLAGS@
+ NEON_LINK_FLAGS = @NEON_LINK_FLAGS@
+ # Note: don't substitute @LIBS@ in here; during a bundled
+ # build of this directory, @LIBS@ may include -lneon.
+ LIBS = @NEON_LIBS@ @NEON_LTLIBS@
+
+-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir)
-I$(top_srcdir)/../expat/lib @NEON_CFLAGS@
++COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -I$(top_builddir) @NEON_CFLAGS@
+ LINK = $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS)
+
+ NEON_BASEOBJS = ne_request.@NEON_OBJEXT@ ne_session.@NEON_OBJEXT@ \
+diff --git a/src/tla/tla/Makefile.in b/src/tla/tla/Makefile.in
+index 13a761a..8c66e2e 100644
+--- a/src/tla/tla/Makefile.in
++++ b/src/tla/tla/Makefile.in
+@@ -21,7 +21,7 @@ Programs: $(programs)
+ endif
+
+ $(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out
-l%, $(libs)))
+- $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS)
-L../../expat -o $@ $< $(thelib) $(libs)
++ $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -o $@
$< $(thelib) $(libs)
+
+ clean: clean-prog
+
diff --git a/0006-tar-preserve.patch b/0006-tar-preserve.patch
new file mode 100644
index 0000000..9345b20
--- /dev/null
+++ b/0006-tar-preserve.patch
@@ -0,0 +1,26 @@
+From: Tim Gokcen <hexe...@gmail.com>
+Date: Sat, 12 Nov 2011 10:34:41 +0100
+Subject: tar preserve
+
+Don't use deprecated tar --preserve option
+Instead, use --preserve-permissions & --preserve-order
+
+Bug-Debian: http://bugs.debian.org/605048
+---
+ src/tla/libarch/archive.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/tla/libarch/archive.c b/src/tla/libarch/archive.c
+index ac3d580..7e699f7 100644
+--- a/src/tla/libarch/archive.c
++++ b/src/tla/libarch/archive.c
+@@ -1114,7 +1114,8 @@ invoke_tar_extract (int * pid_ret)
+
+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) =
cfg__gnu_tar;
+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-m";
+- *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) =
"--preserve";
++ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) =
"--preserve-permissions";
++ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) =
"--preserve-order";
+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-zxf";
+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-";
+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = 0;
diff --git a/0007-fix-some-includes.patch b/0007-fix-some-includes.patch
new file mode 100644
index 0000000..17f0ef0
--- /dev/null
+++ b/0007-fix-some-includes.patch
@@ -0,0 +1,45 @@
+From: unknown, added by Tim Gokcen <hexe...@gmail.com>
+Subject: fix some includes
+
+---
+ src/tla/libarch/cmd-apply-delta.c | 1 +
+ src/tla/libarch/cmdutils.c | 1 +
+ src/tla/libfsutils/tmp-files.c | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/tla/libarch/cmd-apply-delta.c
b/src/tla/libarch/cmd-apply-delta.c
+index 8aebd8b..1b9111a 100644
+--- a/src/tla/libarch/cmd-apply-delta.c
++++ b/src/tla/libarch/cmd-apply-delta.c
+@@ -31,6 +31,7 @@
+ #include "tla/libarch/cmd-get.h"
+ #include "tla/libarch/cmd-delta.h"
+ #include "tla/libarch/cmd-apply-delta.h"
++#include "tla/libarch/cmdutils.h"
+
+
+ /* __STDC__ prototypes for static functions */
+diff --git a/src/tla/libarch/cmdutils.c b/src/tla/libarch/cmdutils.c
+index 3aafd13..bb88bb4 100644
+--- a/src/tla/libarch/cmdutils.c
++++ b/src/tla/libarch/cmdutils.c
+@@ -16,6 +16,7 @@
+ #include "hackerlab/char/str.h"
+ #include "tla/libarch/cmdutils.h"
+ #include "tla/libarch/libraries.h"
++#include "tla/libarch/local-cache.h"
+ #include "tla/libarch/project-tree.h"
+ #include "tla/libarch/patch-logs.h"
+ #include "tla/libarch/pfs.h"
+diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c
+index 164acdb..13d7b02 100644
+--- a/src/tla/libfsutils/tmp-files.c
++++ b/src/tla/libfsutils/tmp-files.c
+@@ -16,6 +16,7 @@
+ #include "hackerlab/char/str-many.h"
+ #include "hackerlab/vu/safe.h"
+ #include "hackerlab/fs/file-names.h"
++#include "hackerlab/fs/tmp-files.h"
+ #include "hackerlab/vu/safe.h"
+ #include "tla/libfsutils/tmp-files.h"
+
diff --git a/0008-fix-spelling.patch b/0008-fix-spelling.patch
new file mode 100644
index 0000000..ca17289
--- /dev/null
+++ b/0008-fix-spelling.patch
@@ -0,0 +1,35 @@
+From: Tim Gokcen <hexe...@gmail.com>
+Date: Sat, 12 Nov 2011 10:34:43 +0100
+Subject: fix spelling
+
+---
+ src/tla/libarch/cmd-archives.c | 2 +-
+ src/tla/libarch/cmd-lock-revision.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tla/libarch/cmd-archives.c b/src/tla/libarch/cmd-archives.c
+index 026ca5d..bacb1eb 100644
+--- a/src/tla/libarch/cmd-archives.c
++++ b/src/tla/libarch/cmd-archives.c
+@@ -152,7 +152,7 @@ arch_cmd_archives (t_uchar * program_name, int argc, char
* argv[])
+ re_error = regcomp(&source_needle, "-SOURCE", REG_EXTENDED);
+
+ if (re_error)
+- panic("Unable to compile regular expresion.");
++ panic("Unable to compile regular expression.");
+
+
+ for (x = 0; x < rel_n_records (list); ++x)
+diff --git a/src/tla/libarch/cmd-lock-revision.c
b/src/tla/libarch/cmd-lock-revision.c
+index 99bb3ed..39762c8 100644
+--- a/src/tla/libarch/cmd-lock-revision.c
++++ b/src/tla/libarch/cmd-lock-revision.c
+@@ -227,7 +227,7 @@ arch_cmd_lock_revision (t_uchar * program_name, int argc,
char * argv[])
+ }
+ case arch_revision_unknown_lock_state:
+ {
+- safe_printfmt (2, "%s: unkown lock state for %s/%s\n",
++ safe_printfmt (2, "%s: unknown lock state for %s/%s\n",
+ argv[0], archive, revision);
+ safe_printfmt (2, " (lock was in transition -- consider
retrying)\n");
+ exit (1);
diff --git a/0009-Remove-rpath-from-libneon.patch
b/0009-Remove-rpath-from-libneon.patch
new file mode 100644
index 0000000..6864e23
--- /dev/null
+++ b/0009-Remove-rpath-from-libneon.patch
@@ -0,0 +1,80 @@
+From: Tim Gokcen <hexe...@gmail.com>
+Date: Sat, 12 Nov 2011 10:34:44 +0100
+Subject: Remove -rpath from libneon
+
+---
+ src/libneon/configure | 15 ++++++++++++++-
+ src/libneon/configure.in | 14 +++++++++++++-
+ src/libneon/src/Makefile.in | 2 +-
+ 3 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/libneon/configure b/src/libneon/configure
+index 45ab19d..a48af77 100755
+--- a/src/libneon/configure
++++ b/src/libneon/configure
+@@ -8155,10 +8155,23 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
++top_builddir=`pwd`
++# by Marcelo Magallon <mmaga...@efis.ucr.ac.cr>
++# Turn around -rpath problem with libtool 1.0c
++# This define should be improbable enough to not conflict with anything
++case ${host} in
++ *-linux-gnu)
++ echo "$as_me:$LINENO: result: Fixing libtool for -rpath
problems." >&5
++echo "${ECHO_T}Fixing libtool for -rpath problems." >&6
++ sed <${ofile} >${ofile}-2 \
++
's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec="
-D__LIBTOOL_IS_A_FOOL__ "/'
++ mv ${ofile}-2 ${ofile}
++ chmod 755 ${ofile}
++ ;;
++esac
+
+
+
+-top_builddir=`pwd`
+
+
+ # Check whether --enable-webdav or --disable-webdav was given.
+diff --git a/src/libneon/configure.in b/src/libneon/configure.in
+index 6ba8603..acad847 100644
+--- a/src/libneon/configure.in
++++ b/src/libneon/configure.in
+@@ -40,10 +40,22 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
+
+ AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
++top_builddir=`pwd`
++# by Marcelo Magallon <mmaga...@efis.ucr.ac.cr>
++# Turn around -rpath problem with libtool 1.0c
++# This define should be improbable enough to not conflict with anything
++case ${host} in
++ *-linux-gnu)
++ AC_MSG_RESULT([Fixing libtool for -rpath problems.])
++ sed <${ofile} >${ofile}-2 \
++
's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec="
-D__LIBTOOL_IS_A_FOOL__ "/'
++ mv ${ofile}-2 ${ofile}
++ chmod 755 ${ofile}
++ ;;
++esac
+
+ AC_EXEEXT
+
+-top_builddir=`pwd`
+ AC_SUBST(top_builddir)
+
+ AC_ARG_ENABLE(webdav,
+diff --git a/src/libneon/src/Makefile.in b/src/libneon/src/Makefile.in
+index aff1fca..b5d9c74 100644
+--- a/src/libneon/src/Makefile.in
++++ b/src/libneon/src/Makefile.in
+@@ -67,7 +67,7 @@ all-no:
+ $(COMPILE) -c $< -o $@
+
+ libneon.la: $(OBJECTS)
+- $(LINK) -rpath $(libdir) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS)
++ $(LINK) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS)
+
+ libneon.a: $(OBJECTS)
+ $(AR) cru $@ $(addsuffix .o, $(basename $(OBJECTS)))
diff --git a/0010-add-missing-include.patch b/0010-add-missing-include.patch
new file mode 100644
index 0000000..3c3dcc7
--- /dev/null
+++ b/0010-add-missing-include.patch
@@ -0,0 +1,23 @@
+From: Tim Gokcen <hexe...@gmail.com>
+Date: Thu, 8 Sep 2011 14:43:36 -0400
+Subject: add missing include
+
+Fix Ubuntu Oneiric build which complains about function return value
implicitly converted to pointer due to function header not being #included
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tla/+bug/832877
+---
+ src/tla/libfsutils/tmp-files.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c
+index 13d7b02..fc39d6d 100644
+--- a/src/tla/libfsutils/tmp-files.c
++++ b/src/tla/libfsutils/tmp-files.c
+@@ -19,6 +19,7 @@
+ #include "hackerlab/fs/tmp-files.h"
+ #include "hackerlab/vu/safe.h"
+ #include "tla/libfsutils/tmp-files.h"
++#include "tla/libarch/cmdutils.h"
+
+
+
diff --git a/0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch
b/0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch
new file mode 100644
index 0000000..d49aaf3
--- /dev/null
+++ b/0011-Fix-malformed-comment-in-tla-doc-handbook-index.html.patch
@@ -0,0 +1,22 @@
+From: Kevin Ryde <use...@zip.com.au>
+Date: Mon, 8 Aug 2005 10:23:19 +1000
+Subject: Fix malformed comment in tla-doc/handbook/index.html
+
+Bug-Debian: http://bugs.debian.org/321887
+---
+ src/docs-tla/index.html | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/docs-tla/index.html b/src/docs-tla/index.html
+index bd0342b..a9ddbd3 100644
+--- a/src/docs-tla/index.html
++++ b/src/docs-tla/index.html
+@@ -9,7 +9,7 @@
+
+ </div>
+ <div class="mainContent">
+-<!-- BEGIN the main body>
++<!-- BEGIN the main body-->
+
+ <h1 class=essay-title>
+ A GNU Arch Handbook<br>
diff --git a/0012-update-tla-tree-list-to-point-to-tla-add-id.patch
b/0012-update-tla-tree-list-to-point-to-tla-add-id.patch
new file mode 100644
index 0000000..5052996
--- /dev/null
+++ b/0012-update-tla-tree-list-to-point-to-tla-add-id.patch
@@ -0,0 +1,25 @@
+From: Julien PUYDT <jpu...@free.fr>
+Date: Wed, 6 Jul 2005 15:48:48 +0200
+Subject: update tla tree-list to point to tla add-id
+
+the recent change broke "tla add", replacing it by "tla add-id". The
+problem is that "tla tree-lint" still points to the former command.
+
+Bug-Debian: http://bugs.debian.org/317128
+---
+ src/tla/libarch/proj-tree-lint.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/tla/libarch/proj-tree-lint.c
b/src/tla/libarch/proj-tree-lint.c
+index 3f213f3..3154ab9 100644
+--- a/src/tla/libarch/proj-tree-lint.c
++++ b/src/tla/libarch/proj-tree-lint.c
+@@ -66,7 +66,7 @@ arch_print_tree_lint_report (int fd, struct
arch_tree_lint_result * lint, int es
+
+ if (rel_n_records (lint->warning_files))
+ {
+- safe_printfmt (fd, "These files would be source but lack inventory ids
(`tla add' or a tagline perhaps?):\n\n");
++ safe_printfmt (fd, "These files would be source but lack inventory ids
(`tla add-id' or a tagline perhaps?):\n\n");
+ rel_print_pika_escape_iso8859_1_table (fd, escape_classes,
lint->warning_files);
+ safe_printfmt (fd, "\n\n");
+ if (!status)
diff --git a/0013-fix-libneon-configure-options.patch
b/0013-fix-libneon-configure-options.patch
new file mode 100644
index 0000000..61bc8c9
--- /dev/null
+++ b/0013-fix-libneon-configure-options.patch
@@ -0,0 +1,38 @@
+From: Bernhard R. Link <brl...@debian.org>
+Date: Mon, 14 Nov 2011 16:29:16 +0100
+Subject: fix libneon configure options
+
+As tla's configure calls configure without any of the needed options and
+gets confused by CFLAGS containing -Werror=format-security, just give it
+the proper options...
+---
+ src/libneon/PLUGIN/AUTOCONF | 20 +++-----------------
+ 1 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/src/libneon/PLUGIN/AUTOCONF b/src/libneon/PLUGIN/AUTOCONF
+index 95a28bb..63d8945 100644
+--- a/src/libneon/PLUGIN/AUTOCONF
++++ b/src/libneon/PLUGIN/AUTOCONF
+@@ -1,19 +1,5 @@
+ #!/bin/sh
+
+-if test ! -z "$CFLAGS" ; then
+- printf '\n'
+- printf '================================\n'
+- printf 'WARNING:\n'
+- printf '\n'
+- printf ' Discarding "-Werror" from $CFLAGS\n'
+- printf ' while configuring "src/libneon"\n'
+- printf '\n'
+- printf '================================\n'
+- printf '\n'
+- if printf '%s' "$CFLAGS" | grep -q -e -Werror ; then
+- CFLAGS="$(printf '%s' "$CFLAGS" | sed -e 's/-Werror//g')"
+- fi
+-fi
+-
+-
+-"$1" --with-ssl=no --with-included-expat --with-expat --disable-shared
--enable-static
++"$1" --with-ssl=no --with-included-expat --with-expat --disable-shared
--enable-static \
++ ${AUTOCONF_CROSS} CFLAGS="${AUTOCONF_CFLAGS}"
CPPFLAGS="${AUTOCONF_CPPFLAGS}" \
++ LDFLAGS="${AUTOCONFLDFLAGS}"
diff --git a/0014-do-not-show-the-build-date.patch
b/0014-do-not-show-the-build-date.patch
new file mode 100644
index 0000000..3b847f5
--- /dev/null
+++ b/0014-do-not-show-the-build-date.patch
@@ -0,0 +1,16 @@
+From: Santiago Vila <sanv...@debian.org>
+Subject: We can do fine without the build date
+
+--- a/src/tla/tla/tla.c
++++ b/src/tla/tla/tla.c
+@@ -61,9 +61,8 @@
+ {
+ safe_printfmt (1, cfg__std__package "\n");
+ #ifdef TLA_REVISION
+- safe_printfmt(1, "%s, ", TLA_REVISION);
++ safe_printfmt(1, "%s\n", TLA_REVISION);
+ #endif
+- safe_printfmt (1, "built on %s\n", __DATE__);
+ safe_printfmt (1, "\n");
+ safe_printfmt (1, "Copyright 2003, 2004, 2005, 2006 Free Software
Foundation, Inc. and contributors\n");
+ safe_printfmt (1, "Written by Thomas Lord, et al. See the AUTHORS file
for a list.\n");
diff --git a/0015-changeset-fd-leak.patch b/0015-changeset-fd-leak.patch
new file mode 100644
index 0000000..4f9dbba
--- /dev/null
+++ b/0015-changeset-fd-leak.patch
@@ -0,0 +1,15 @@
+From: Sergio Gelato <sergio.gel...@astro.su.se>
+Subject: Remember to close file descriptors before they go out of scope.
+
+--- a/src/tla/libarch/make-changeset.c
++++ b/src/tla/libarch/make-changeset.c
+@@ -1485,6 +1485,9 @@
+ safe_printfmt (orig_out_fd, "%s\n", orig_target);
+ safe_printfmt (mod_out_fd, "%s\n", mod_target);
+
++ safe_close (orig_out_fd);
++ safe_close (mod_out_fd);
++
+ lim_free (0, patch_basename_path);
+ lim_free (0, orig_patch);
+ lim_free (0, mod_patch);
diff --git a/tla-neon.patch b/tla-neon.patch
index 2c85f22..b27f925 100644
--- a/tla-neon.patch
+++ b/tla-neon.patch
@@ -13,7 +13,7 @@
endif
$(programs):%$(cfg__exec_suffix):%.o $(thelib) $(filter-out -L%, $(filter-out
-l%, $(libs)))
-- $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS)
-L../../expat -o $@ $< $(thelib) $(libs)
+- $(SHELL) $(objroot)/libneon/libtool --mode=link $(CC) $(CFLAGS) -o $@
$< $(thelib) $(libs)
+ libtool --mode=link $(CC) $(CFLAGS) -o $@ $< $(thelib) $(libs)
clean: clean-prog
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tla.git/commitdiff/c296792b0207a02108df34390e671a2125a5b597
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
