summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2021-02-02 11:26:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-07 22:26:42 +0000
commit43421f57bceccccf5f4d3d8146df996642cfc6d7 (patch)
tree43268779b1bf989b721ced2b47c3847faaab746c /meta
parent987aa920172f8cf8b4854812f623a8c018746cea (diff)
downloadpoky-43421f57bceccccf5f4d3d8146df996642cfc6d7.tar.gz
Revert "lrzsz: Fix to work with autoconf 2.70"
This change was only needed with 2.70, it is not needed with 2.71. This reverts commit 36aef08dcd5e45c4138ccd72e8de01157f7213c4. (From OE-Core rev: 37362d8bdbec17a676af41b13683efd17c0cef50) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch249
1 files changed, 107 insertions, 142 deletions
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch
index 4a50f7410a..33af38b4a8 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch
@@ -3,10 +3,9 @@ Update autotools infrastructure (including gettext) to modern versions.
3Upstream-Status: Pending 3Upstream-Status: Pending
4Signed-off-by: Phil Blundell <pb@pbcl.net> 4Signed-off-by: Phil Blundell <pb@pbcl.net>
5 5
6Index: lrzsz-0.12.20/configure.in 6diff -uprN clean/lrzsz-0.12.20/configure.in lrzsz-0.12.20/configure.in
7=================================================================== 7--- clean/lrzsz-0.12.20/configure.in 1998-12-30 07:50:07.000000000 +0000
8--- lrzsz-0.12.20.orig/configure.in 8+++ lrzsz-0.12.20/configure.in 2019-11-25 16:22:37.000000000 +0000
9+++ lrzsz-0.12.20/configure.in
10@@ -92,7 +92,6 @@ AC_PROG_RANLIB 9@@ -92,7 +92,6 @@ AC_PROG_RANLIB
11 AC_ISC_POSIX 10 AC_ISC_POSIX
12 AC_AIX 11 AC_AIX
@@ -15,7 +14,7 @@ Index: lrzsz-0.12.20/configure.in
15 AC_C_CONST 14 AC_C_CONST
16 AC_C_INLINE 15 AC_C_INLINE
17 16
18@@ -253,18 +252,14 @@ ihave$lookup_facility 17@@ -253,18 +252,13 @@ ihave$lookup_facility
19 fi 18 fi
20 19
21 20
@@ -25,7 +24,6 @@ Index: lrzsz-0.12.20/configure.in
25 24
26-AM_GNU_GETTEXT 25-AM_GNU_GETTEXT
27+AM_GNU_GETTEXT([external]) 26+AM_GNU_GETTEXT([external])
28+AM_GNU_GETTEXT_VERSION([0.21])
29 27
30-AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME") 28-AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
31-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) 29-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
@@ -38,10 +36,9 @@ Index: lrzsz-0.12.20/configure.in
38+[ 36+[
39 chmod +x debian/rules; 37 chmod +x debian/rules;
40 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h]) 38 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
41Index: lrzsz-0.12.20/intl/bindtextdom.c 39diff -uprN clean/lrzsz-0.12.20/intl/bindtextdom.c lrzsz-0.12.20/intl/bindtextdom.c
42=================================================================== 40--- clean/lrzsz-0.12.20/intl/bindtextdom.c 1998-04-26 14:22:36.000000000 +0100
43--- lrzsz-0.12.20.orig/intl/bindtextdom.c 41+++ lrzsz-0.12.20/intl/bindtextdom.c 1970-01-01 01:00:00.000000000 +0100
44+++ /dev/null
45@@ -1,199 +0,0 @@ 42@@ -1,199 +0,0 @@
46-/* Implementation of the bindtextdomain(3) function 43-/* Implementation of the bindtextdomain(3) function
47- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 44- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -242,10 +239,9 @@ Index: lrzsz-0.12.20/intl/bindtextdom.c
242-/* Alias for function name in GNU C Library. */ 239-/* Alias for function name in GNU C Library. */
243-weak_alias (__bindtextdomain, bindtextdomain); 240-weak_alias (__bindtextdomain, bindtextdomain);
244-#endif 241-#endif
245Index: lrzsz-0.12.20/intl/cat-compat.c 242diff -uprN clean/lrzsz-0.12.20/intl/cat-compat.c lrzsz-0.12.20/intl/cat-compat.c
246=================================================================== 243--- clean/lrzsz-0.12.20/intl/cat-compat.c 1998-04-26 14:22:37.000000000 +0100
247--- lrzsz-0.12.20.orig/intl/cat-compat.c 244+++ lrzsz-0.12.20/intl/cat-compat.c 1970-01-01 01:00:00.000000000 +0100
248+++ /dev/null
249@@ -1,262 +0,0 @@ 245@@ -1,262 +0,0 @@
250-/* Compatibility code for gettext-using-catgets interface. 246-/* Compatibility code for gettext-using-catgets interface.
251- Copyright (C) 1995, 1997 Free Software Foundation, Inc. 247- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
@@ -509,10 +505,9 @@ Index: lrzsz-0.12.20/intl/cat-compat.c
509- return dest - 1; 505- return dest - 1;
510-} 506-}
511-#endif 507-#endif
512Index: lrzsz-0.12.20/intl/ChangeLog 508diff -uprN clean/lrzsz-0.12.20/intl/ChangeLog lrzsz-0.12.20/intl/ChangeLog
513=================================================================== 509--- clean/lrzsz-0.12.20/intl/ChangeLog 1998-04-26 14:22:35.000000000 +0100
514--- lrzsz-0.12.20.orig/intl/ChangeLog 510+++ lrzsz-0.12.20/intl/ChangeLog 1970-01-01 01:00:00.000000000 +0100
515+++ /dev/null
516@@ -1,1022 +0,0 @@ 511@@ -1,1022 +0,0 @@
517-1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com> 512-1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com>
518- 513-
@@ -1536,10 +1531,9 @@ Index: lrzsz-0.12.20/intl/ChangeLog
1536- which allow to use the X/Open catgets function with an interface 1531- which allow to use the X/Open catgets function with an interface
1537- like the Uniforum gettext function. For system which does not 1532- like the Uniforum gettext function. For system which does not
1538- have neither of those a complete implementation is provided. 1533- have neither of those a complete implementation is provided.
1539Index: lrzsz-0.12.20/intl/dcgettext.c 1534diff -uprN clean/lrzsz-0.12.20/intl/dcgettext.c lrzsz-0.12.20/intl/dcgettext.c
1540=================================================================== 1535--- clean/lrzsz-0.12.20/intl/dcgettext.c 1998-04-26 14:22:36.000000000 +0100
1541--- lrzsz-0.12.20.orig/intl/dcgettext.c 1536+++ lrzsz-0.12.20/intl/dcgettext.c 1970-01-01 01:00:00.000000000 +0100
1542+++ /dev/null
1543@@ -1,593 +0,0 @@ 1537@@ -1,593 +0,0 @@
1544-/* Implementation of the dcgettext(3) function 1538-/* Implementation of the dcgettext(3) function
1545- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 1539- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -2134,10 +2128,9 @@ Index: lrzsz-0.12.20/intl/dcgettext.c
2134- return dest - 1; 2128- return dest - 1;
2135-} 2129-}
2136-#endif 2130-#endif
2137Index: lrzsz-0.12.20/intl/dgettext.c 2131diff -uprN clean/lrzsz-0.12.20/intl/dgettext.c lrzsz-0.12.20/intl/dgettext.c
2138=================================================================== 2132--- clean/lrzsz-0.12.20/intl/dgettext.c 1998-04-26 14:20:52.000000000 +0100
2139--- lrzsz-0.12.20.orig/intl/dgettext.c 2133+++ lrzsz-0.12.20/intl/dgettext.c 1970-01-01 01:00:00.000000000 +0100
2140+++ /dev/null
2141@@ -1,59 +0,0 @@ 2134@@ -1,59 +0,0 @@
2142-/* dgettext.c -- implementation of the dgettext(3) function 2135-/* dgettext.c -- implementation of the dgettext(3) function
2143- Copyright (C) 1995 Software Foundation, Inc. 2136- Copyright (C) 1995 Software Foundation, Inc.
@@ -2198,10 +2191,9 @@ Index: lrzsz-0.12.20/intl/dgettext.c
2198-/* Alias for function name in GNU C Library. */ 2191-/* Alias for function name in GNU C Library. */
2199-weak_alias (__dgettext, dgettext); 2192-weak_alias (__dgettext, dgettext);
2200-#endif 2193-#endif
2201Index: lrzsz-0.12.20/intl/explodename.c 2194diff -uprN clean/lrzsz-0.12.20/intl/explodename.c lrzsz-0.12.20/intl/explodename.c
2202=================================================================== 2195--- clean/lrzsz-0.12.20/intl/explodename.c 1998-04-26 14:22:37.000000000 +0100
2203--- lrzsz-0.12.20.orig/intl/explodename.c 2196+++ lrzsz-0.12.20/intl/explodename.c 1970-01-01 01:00:00.000000000 +0100
2204+++ /dev/null
2205@@ -1,181 +0,0 @@ 2197@@ -1,181 +0,0 @@
2206-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 2198-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
2207- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. 2199- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -2384,10 +2376,9 @@ Index: lrzsz-0.12.20/intl/explodename.c
2384- 2376-
2385- return mask; 2377- return mask;
2386-} 2378-}
2387Index: lrzsz-0.12.20/intl/finddomain.c 2379diff -uprN clean/lrzsz-0.12.20/intl/finddomain.c lrzsz-0.12.20/intl/finddomain.c
2388=================================================================== 2380--- clean/lrzsz-0.12.20/intl/finddomain.c 1998-04-26 14:22:36.000000000 +0100
2389--- lrzsz-0.12.20.orig/intl/finddomain.c 2381+++ lrzsz-0.12.20/intl/finddomain.c 1970-01-01 01:00:00.000000000 +0100
2390+++ /dev/null
2391@@ -1,189 +0,0 @@ 2382@@ -1,189 +0,0 @@
2392-/* Handle list of needed message catalogs 2383-/* Handle list of needed message catalogs
2393- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 2384- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -2578,10 +2569,9 @@ Index: lrzsz-0.12.20/intl/finddomain.c
2578- 2569-
2579- return retval; 2570- return retval;
2580-} 2571-}
2581Index: lrzsz-0.12.20/intl/gettext.c 2572diff -uprN clean/lrzsz-0.12.20/intl/gettext.c lrzsz-0.12.20/intl/gettext.c
2582=================================================================== 2573--- clean/lrzsz-0.12.20/intl/gettext.c 1998-04-26 14:22:36.000000000 +0100
2583--- lrzsz-0.12.20.orig/intl/gettext.c 2574+++ lrzsz-0.12.20/intl/gettext.c 1970-01-01 01:00:00.000000000 +0100
2584+++ /dev/null
2585@@ -1,70 +0,0 @@ 2575@@ -1,70 +0,0 @@
2586-/* Implementation of gettext(3) function 2576-/* Implementation of gettext(3) function
2587- Copyright (C) 1995, 1997 Free Software Foundation, Inc. 2577- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
@@ -2653,10 +2643,9 @@ Index: lrzsz-0.12.20/intl/gettext.c
2653-/* Alias for function name in GNU C Library. */ 2643-/* Alias for function name in GNU C Library. */
2654-weak_alias (__gettext, gettext); 2644-weak_alias (__gettext, gettext);
2655-#endif 2645-#endif
2656Index: lrzsz-0.12.20/intl/gettext.h 2646diff -uprN clean/lrzsz-0.12.20/intl/gettext.h lrzsz-0.12.20/intl/gettext.h
2657=================================================================== 2647--- clean/lrzsz-0.12.20/intl/gettext.h 1998-04-26 14:22:35.000000000 +0100
2658--- lrzsz-0.12.20.orig/intl/gettext.h 2648+++ lrzsz-0.12.20/intl/gettext.h 1970-01-01 01:00:00.000000000 +0100
2659+++ /dev/null
2660@@ -1,105 +0,0 @@ 2649@@ -1,105 +0,0 @@
2661-/* Internal header for GNU gettext internationalization functions 2650-/* Internal header for GNU gettext internationalization functions
2662- Copyright (C) 1995, 1997 Free Software Foundation, Inc. 2651- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
@@ -2763,10 +2752,9 @@ Index: lrzsz-0.12.20/intl/gettext.h
2763-/* @@ begin of epilog @@ */ 2752-/* @@ begin of epilog @@ */
2764- 2753-
2765-#endif /* gettext.h */ 2754-#endif /* gettext.h */
2766Index: lrzsz-0.12.20/intl/gettextP.h 2755diff -uprN clean/lrzsz-0.12.20/intl/gettextP.h lrzsz-0.12.20/intl/gettextP.h
2767=================================================================== 2756--- clean/lrzsz-0.12.20/intl/gettextP.h 1998-04-26 14:22:35.000000000 +0100
2768--- lrzsz-0.12.20.orig/intl/gettextP.h 2757+++ lrzsz-0.12.20/intl/gettextP.h 1970-01-01 01:00:00.000000000 +0100
2769+++ /dev/null
2770@@ -1,73 +0,0 @@ 2758@@ -1,73 +0,0 @@
2771-/* Header describing internals of gettext library 2759-/* Header describing internals of gettext library
2772- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 2760- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -2841,10 +2829,9 @@ Index: lrzsz-0.12.20/intl/gettextP.h
2841-/* @@ begin of epilog @@ */ 2829-/* @@ begin of epilog @@ */
2842- 2830-
2843-#endif /* gettextP.h */ 2831-#endif /* gettextP.h */
2844Index: lrzsz-0.12.20/intl/hash-string.h 2832diff -uprN clean/lrzsz-0.12.20/intl/hash-string.h lrzsz-0.12.20/intl/hash-string.h
2845=================================================================== 2833--- clean/lrzsz-0.12.20/intl/hash-string.h 1998-04-26 14:22:36.000000000 +0100
2846--- lrzsz-0.12.20.orig/intl/hash-string.h 2834+++ lrzsz-0.12.20/intl/hash-string.h 1970-01-01 01:00:00.000000000 +0100
2847+++ /dev/null
2848@@ -1,63 +0,0 @@ 2835@@ -1,63 +0,0 @@
2849-/* Implements a string hashing function. 2836-/* Implements a string hashing function.
2850- Copyright (C) 1995, 1997 Free Software Foundation, Inc. 2837- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
@@ -2909,10 +2896,9 @@ Index: lrzsz-0.12.20/intl/hash-string.h
2909- } 2896- }
2910- return hval; 2897- return hval;
2911-} 2898-}
2912Index: lrzsz-0.12.20/intl/intl-compat.c 2899diff -uprN clean/lrzsz-0.12.20/intl/intl-compat.c lrzsz-0.12.20/intl/intl-compat.c
2913=================================================================== 2900--- clean/lrzsz-0.12.20/intl/intl-compat.c 1998-04-26 14:20:52.000000000 +0100
2914--- lrzsz-0.12.20.orig/intl/intl-compat.c 2901+++ lrzsz-0.12.20/intl/intl-compat.c 1970-01-01 01:00:00.000000000 +0100
2915+++ /dev/null
2916@@ -1,76 +0,0 @@ 2902@@ -1,76 +0,0 @@
2917-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext 2903-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
2918- Library. 2904- Library.
@@ -2990,10 +2976,9 @@ Index: lrzsz-0.12.20/intl/intl-compat.c
2990-{ 2976-{
2991- return textdomain__ (domainname); 2977- return textdomain__ (domainname);
2992-} 2978-}
2993Index: lrzsz-0.12.20/intl/l10nflist.c 2979diff -uprN clean/lrzsz-0.12.20/intl/l10nflist.c lrzsz-0.12.20/intl/l10nflist.c
2994=================================================================== 2980--- clean/lrzsz-0.12.20/intl/l10nflist.c 1998-04-26 14:22:37.000000000 +0100
2995--- lrzsz-0.12.20.orig/intl/l10nflist.c 2981+++ lrzsz-0.12.20/intl/l10nflist.c 1970-01-01 01:00:00.000000000 +0100
2996+++ /dev/null
2997@@ -1,409 +0,0 @@ 2982@@ -1,409 +0,0 @@
2998-/* Handle list of needed message catalogs 2983-/* Handle list of needed message catalogs
2999- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 2984- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -3404,10 +3389,9 @@ Index: lrzsz-0.12.20/intl/l10nflist.c
3404- return dest - 1; 3389- return dest - 1;
3405-} 3390-}
3406-#endif 3391-#endif
3407Index: lrzsz-0.12.20/intl/libgettext.h 3392diff -uprN clean/lrzsz-0.12.20/intl/libgettext.h lrzsz-0.12.20/intl/libgettext.h
3408=================================================================== 3393--- clean/lrzsz-0.12.20/intl/libgettext.h 1998-04-26 14:22:36.000000000 +0100
3409--- lrzsz-0.12.20.orig/intl/libgettext.h 3394+++ lrzsz-0.12.20/intl/libgettext.h 1970-01-01 01:00:00.000000000 +0100
3410+++ /dev/null
3411@@ -1,182 +0,0 @@ 3395@@ -1,182 +0,0 @@
3412-/* Message catalogs for internationalization. 3396-/* Message catalogs for internationalization.
3413- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 3397- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -3591,10 +3575,9 @@ Index: lrzsz-0.12.20/intl/libgettext.h
3591-#endif 3575-#endif
3592- 3576-
3593-#endif 3577-#endif
3594Index: lrzsz-0.12.20/intl/linux-msg.sed 3578diff -uprN clean/lrzsz-0.12.20/intl/linux-msg.sed lrzsz-0.12.20/intl/linux-msg.sed
3595=================================================================== 3579--- clean/lrzsz-0.12.20/intl/linux-msg.sed 1998-04-26 14:20:52.000000000 +0100
3596--- lrzsz-0.12.20.orig/intl/linux-msg.sed 3580+++ lrzsz-0.12.20/intl/linux-msg.sed 1970-01-01 01:00:00.000000000 +0100
3597+++ /dev/null
3598@@ -1,100 +0,0 @@ 3581@@ -1,100 +0,0 @@
3599-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file 3582-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
3600-# Copyright (C) 1995 Free Software Foundation, Inc. 3583-# Copyright (C) 1995 Free Software Foundation, Inc.
@@ -3696,10 +3679,9 @@ Index: lrzsz-0.12.20/intl/linux-msg.sed
3696- tb 3679- tb
3697-} 3680-}
3698-d 3681-d
3699Index: lrzsz-0.12.20/intl/loadinfo.h 3682diff -uprN clean/lrzsz-0.12.20/intl/loadinfo.h lrzsz-0.12.20/intl/loadinfo.h
3700=================================================================== 3683--- clean/lrzsz-0.12.20/intl/loadinfo.h 1998-04-26 14:20:52.000000000 +0100
3701--- lrzsz-0.12.20.orig/intl/loadinfo.h 3684+++ lrzsz-0.12.20/intl/loadinfo.h 1970-01-01 01:00:00.000000000 +0100
3702+++ /dev/null
3703@@ -1,58 +0,0 @@ 3685@@ -1,58 +0,0 @@
3704-#ifndef PARAMS 3686-#ifndef PARAMS
3705-# if __STDC__ 3687-# if __STDC__
@@ -3759,10 +3741,9 @@ Index: lrzsz-0.12.20/intl/loadinfo.h
3759- const char **special, 3741- const char **special,
3760- const char **sponsor, 3742- const char **sponsor,
3761- const char **revision)); 3743- const char **revision));
3762Index: lrzsz-0.12.20/intl/loadmsgcat.c 3744diff -uprN clean/lrzsz-0.12.20/intl/loadmsgcat.c lrzsz-0.12.20/intl/loadmsgcat.c
3763=================================================================== 3745--- clean/lrzsz-0.12.20/intl/loadmsgcat.c 1998-04-26 14:22:37.000000000 +0100
3764--- lrzsz-0.12.20.orig/intl/loadmsgcat.c 3746+++ lrzsz-0.12.20/intl/loadmsgcat.c 1970-01-01 01:00:00.000000000 +0100
3765+++ /dev/null
3766@@ -1,199 +0,0 @@ 3747@@ -1,199 +0,0 @@
3767-/* Load needed message catalogs 3748-/* Load needed message catalogs
3768- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 3749- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -3963,10 +3944,9 @@ Index: lrzsz-0.12.20/intl/loadmsgcat.c
3963- translations invalid. */ 3944- translations invalid. */
3964- ++_nl_msg_cat_cntr; 3945- ++_nl_msg_cat_cntr;
3965-} 3946-}
3966Index: lrzsz-0.12.20/intl/localealias.c 3947diff -uprN clean/lrzsz-0.12.20/intl/localealias.c lrzsz-0.12.20/intl/localealias.c
3967=================================================================== 3948--- clean/lrzsz-0.12.20/intl/localealias.c 1998-04-26 14:22:37.000000000 +0100
3968--- lrzsz-0.12.20.orig/intl/localealias.c 3949+++ lrzsz-0.12.20/intl/localealias.c 1970-01-01 01:00:00.000000000 +0100
3969+++ /dev/null
3970@@ -1,378 +0,0 @@ 3950@@ -1,378 +0,0 @@
3971-/* Handle aliases for locale names 3951-/* Handle aliases for locale names
3972- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 3952- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -4346,10 +4326,9 @@ Index: lrzsz-0.12.20/intl/localealias.c
4346- return c1 - c2; 4326- return c1 - c2;
4347-#endif 4327-#endif
4348-} 4328-}
4349Index: lrzsz-0.12.20/intl/Makefile.in 4329diff -uprN clean/lrzsz-0.12.20/intl/Makefile.in lrzsz-0.12.20/intl/Makefile.in
4350=================================================================== 4330--- clean/lrzsz-0.12.20/intl/Makefile.in 1998-04-26 14:22:35.000000000 +0100
4351--- lrzsz-0.12.20.orig/intl/Makefile.in 4331+++ lrzsz-0.12.20/intl/Makefile.in 1970-01-01 01:00:00.000000000 +0100
4352+++ /dev/null
4353@@ -1,214 +0,0 @@ 4332@@ -1,214 +0,0 @@
4354-# Makefile for directory with message catalog handling in GNU NLS Utilities. 4333-# Makefile for directory with message catalog handling in GNU NLS Utilities.
4355-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 4334-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -4565,10 +4544,9 @@ Index: lrzsz-0.12.20/intl/Makefile.in
4565-# Tell versions [3.59,3.63) of GNU make not to export all variables. 4544-# Tell versions [3.59,3.63) of GNU make not to export all variables.
4566-# Otherwise a system limit (for SysV at least) may be exceeded. 4545-# Otherwise a system limit (for SysV at least) may be exceeded.
4567-.NOEXPORT: 4546-.NOEXPORT:
4568Index: lrzsz-0.12.20/intl/po2tbl.sed.in 4547diff -uprN clean/lrzsz-0.12.20/intl/po2tbl.sed.in lrzsz-0.12.20/intl/po2tbl.sed.in
4569=================================================================== 4548--- clean/lrzsz-0.12.20/intl/po2tbl.sed.in 1998-04-26 14:20:52.000000000 +0100
4570--- lrzsz-0.12.20.orig/intl/po2tbl.sed.in 4549+++ lrzsz-0.12.20/intl/po2tbl.sed.in 1970-01-01 01:00:00.000000000 +0100
4571+++ /dev/null
4572@@ -1,102 +0,0 @@ 4550@@ -1,102 +0,0 @@
4573-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets 4551-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
4574-# Copyright (C) 1995 Free Software Foundation, Inc. 4552-# Copyright (C) 1995 Free Software Foundation, Inc.
@@ -4672,10 +4650,9 @@ Index: lrzsz-0.12.20/intl/po2tbl.sed.in
4672- s/0*\(.*\)/int _msg_tbl_length = \1;/p 4650- s/0*\(.*\)/int _msg_tbl_length = \1;/p
4673-} 4651-}
4674-d 4652-d
4675Index: lrzsz-0.12.20/intl/textdomain.c 4653diff -uprN clean/lrzsz-0.12.20/intl/textdomain.c lrzsz-0.12.20/intl/textdomain.c
4676=================================================================== 4654--- clean/lrzsz-0.12.20/intl/textdomain.c 1998-04-26 14:22:37.000000000 +0100
4677--- lrzsz-0.12.20.orig/intl/textdomain.c 4655+++ lrzsz-0.12.20/intl/textdomain.c 1970-01-01 01:00:00.000000000 +0100
4678+++ /dev/null
4679@@ -1,106 +0,0 @@ 4656@@ -1,106 +0,0 @@
4680-/* Implementation of the textdomain(3) function 4657-/* Implementation of the textdomain(3) function
4681- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. 4658- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -4783,16 +4760,14 @@ Index: lrzsz-0.12.20/intl/textdomain.c
4783-/* Alias for function name in GNU C Library. */ 4760-/* Alias for function name in GNU C Library. */
4784-weak_alias (__textdomain, textdomain); 4761-weak_alias (__textdomain, textdomain);
4785-#endif 4762-#endif
4786Index: lrzsz-0.12.20/intl/VERSION 4763diff -uprN clean/lrzsz-0.12.20/intl/VERSION lrzsz-0.12.20/intl/VERSION
4787=================================================================== 4764--- clean/lrzsz-0.12.20/intl/VERSION 1998-04-26 14:22:37.000000000 +0100
4788--- lrzsz-0.12.20.orig/intl/VERSION 4765+++ lrzsz-0.12.20/intl/VERSION 1970-01-01 01:00:00.000000000 +0100
4789+++ /dev/null
4790@@ -1 +0,0 @@ 4766@@ -1 +0,0 @@
4791-GNU gettext library from gettext-0.10.32 4767-GNU gettext library from gettext-0.10.32
4792Index: lrzsz-0.12.20/intl/xopen-msg.sed 4768diff -uprN clean/lrzsz-0.12.20/intl/xopen-msg.sed lrzsz-0.12.20/intl/xopen-msg.sed
4793=================================================================== 4769--- clean/lrzsz-0.12.20/intl/xopen-msg.sed 1998-04-26 14:20:52.000000000 +0100
4794--- lrzsz-0.12.20.orig/intl/xopen-msg.sed 4770+++ lrzsz-0.12.20/intl/xopen-msg.sed 1970-01-01 01:00:00.000000000 +0100
4795+++ /dev/null
4796@@ -1,104 +0,0 @@ 4771@@ -1,104 +0,0 @@
4797-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file 4772-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
4798-# Copyright (C) 1995 Free Software Foundation, Inc. 4773-# Copyright (C) 1995 Free Software Foundation, Inc.
@@ -4898,10 +4873,9 @@ Index: lrzsz-0.12.20/intl/xopen-msg.sed
4898- tb 4873- tb
4899-} 4874-}
4900-d 4875-d
4901Index: lrzsz-0.12.20/lib/Makefile.am 4876diff -uprN clean/lrzsz-0.12.20/lib/Makefile.am lrzsz-0.12.20/lib/Makefile.am
4902=================================================================== 4877--- clean/lrzsz-0.12.20/lib/Makefile.am 1998-12-27 16:25:26.000000000 +0000
4903--- lrzsz-0.12.20.orig/lib/Makefile.am 4878+++ lrzsz-0.12.20/lib/Makefile.am 2019-11-25 16:22:34.000000000 +0000
4904+++ lrzsz-0.12.20/lib/Makefile.am
4905@@ -1,6 +1,4 @@ 4879@@ -1,6 +1,4 @@
4906 noinst_LIBRARIES=libzmodem.a 4880 noinst_LIBRARIES=libzmodem.a
4907-CFLAGS=@CFLAGS@ 4881-CFLAGS=@CFLAGS@
@@ -4909,10 +4883,9 @@ Index: lrzsz-0.12.20/lib/Makefile.am
4909 4883
4910 EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \ 4884 EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
4911 getopt.c getopt1.c mkdir.c mktime.c \ 4885 getopt.c getopt1.c mkdir.c mktime.c \
4912Index: lrzsz-0.12.20/Makefile.am 4886diff -uprN clean/lrzsz-0.12.20/Makefile.am lrzsz-0.12.20/Makefile.am
4913=================================================================== 4887--- clean/lrzsz-0.12.20/Makefile.am 1998-12-30 11:19:40.000000000 +0000
4914--- lrzsz-0.12.20.orig/Makefile.am 4888+++ lrzsz-0.12.20/Makefile.am 2019-11-26 11:47:29.000000000 +0000
4915+++ lrzsz-0.12.20/Makefile.am
4916@@ -1,5 +1,5 @@ 4889@@ -1,5 +1,5 @@
4917-SUBDIRS = lib intl src po man testsuite 4890-SUBDIRS = lib intl src po man testsuite
4918-EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \ 4891-EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
@@ -4935,10 +4908,9 @@ Index: lrzsz-0.12.20/Makefile.am
4935 4908
4936+ 4909+
4937+ACLOCAL_AMFLAGS = -I m4 4910+ACLOCAL_AMFLAGS = -I m4
4938Index: lrzsz-0.12.20/po/cat-id-tbl.c 4911diff -uprN clean/lrzsz-0.12.20/po/cat-id-tbl.c lrzsz-0.12.20/po/cat-id-tbl.c
4939=================================================================== 4912--- clean/lrzsz-0.12.20/po/cat-id-tbl.c 1998-12-29 09:24:24.000000000 +0000
4940--- lrzsz-0.12.20.orig/po/cat-id-tbl.c 4913+++ lrzsz-0.12.20/po/cat-id-tbl.c 1970-01-01 01:00:00.000000000 +0100
4941+++ /dev/null
4942@@ -1,234 +0,0 @@ 4914@@ -1,234 +0,0 @@
4943-/* Automatically generated by po2tbl.sed from lrzsz.pot. */ 4915-/* Automatically generated by po2tbl.sed from lrzsz.pot. */
4944- 4916-
@@ -5174,10 +5146,10 @@ Index: lrzsz-0.12.20/po/cat-id-tbl.c
5174-}; 5146-};
5175- 5147-
5176-int _msg_tbl_length = 136; 5148-int _msg_tbl_length = 136;
5177Index: lrzsz-0.12.20/po/de.po 5149Binary files clean/lrzsz-0.12.20/po/de.gmo and lrzsz-0.12.20/po/de.gmo differ
5178=================================================================== 5150diff -uprN clean/lrzsz-0.12.20/po/de.po lrzsz-0.12.20/po/de.po
5179--- lrzsz-0.12.20.orig/po/de.po 5151--- clean/lrzsz-0.12.20/po/de.po 1998-12-30 16:31:46.000000000 +0000
5180+++ lrzsz-0.12.20/po/de.po 5152+++ lrzsz-0.12.20/po/de.po 2019-11-26 11:42:07.000000000 +0000
5181@@ -6,10 +6,12 @@ 5153@@ -6,10 +6,12 @@
5182 msgid "" 5154 msgid ""
5183 msgstr "" 5155 msgstr ""
@@ -5412,10 +5384,9 @@ Index: lrzsz-0.12.20/po/de.po
5412 #: src/lrz.c:2079 5384 #: src/lrz.c:2079
5413 msgid "rzfile: reached stop time" 5385 msgid "rzfile: reached stop time"
5414 msgstr "rzfile: Abbruchzeit erreicht" 5386 msgstr "rzfile: Abbruchzeit erreicht"
5415Index: lrzsz-0.12.20/po/lrzsz.pot 5387diff -uprN clean/lrzsz-0.12.20/po/lrzsz.pot lrzsz-0.12.20/po/lrzsz.pot
5416=================================================================== 5388--- clean/lrzsz-0.12.20/po/lrzsz.pot 1998-12-30 07:50:00.000000000 +0000
5417--- lrzsz-0.12.20.orig/po/lrzsz.pot 5389+++ lrzsz-0.12.20/po/lrzsz.pot 2019-11-26 11:39:12.000000000 +0000
5418+++ lrzsz-0.12.20/po/lrzsz.pot
5419@@ -1,24 +1,27 @@ 5390@@ -1,24 +1,27 @@
5420 # SOME DESCRIPTIVE TITLE. 5391 # SOME DESCRIPTIVE TITLE.
5421 # Copyright (C) YEAR Free Software Foundation, Inc. 5392 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -5647,10 +5618,9 @@ Index: lrzsz-0.12.20/po/lrzsz.pot
5647 #: src/lrz.c:2079 5618 #: src/lrz.c:2079
5648 msgid "rzfile: reached stop time" 5619 msgid "rzfile: reached stop time"
5649 msgstr "" 5620 msgstr ""
5650Index: lrzsz-0.12.20/po/Makevars 5621diff -uprN clean/lrzsz-0.12.20/po/Makevars lrzsz-0.12.20/po/Makevars
5651=================================================================== 5622--- clean/lrzsz-0.12.20/po/Makevars 1970-01-01 01:00:00.000000000 +0100
5652--- /dev/null 5623+++ lrzsz-0.12.20/po/Makevars 2019-11-25 18:09:52.000000000 +0000
5653+++ lrzsz-0.12.20/po/Makevars
5654@@ -0,0 +1,78 @@ 5624@@ -0,0 +1,78 @@
5655+# Makefile variables for PO directory in any package using GNU gettext. 5625+# Makefile variables for PO directory in any package using GNU gettext.
5656+ 5626+
@@ -5730,22 +5700,19 @@ Index: lrzsz-0.12.20/po/Makevars
5730+# "no". Set this to no if the POT file and PO files are maintained 5700+# "no". Set this to no if the POT file and PO files are maintained
5731+# externally. 5701+# externally.
5732+DIST_DEPENDS_ON_UPDATE_PO = yes 5702+DIST_DEPENDS_ON_UPDATE_PO = yes
5733Index: lrzsz-0.12.20/po/stamp-cat-id 5703diff -uprN clean/lrzsz-0.12.20/po/stamp-cat-id lrzsz-0.12.20/po/stamp-cat-id
5734=================================================================== 5704--- clean/lrzsz-0.12.20/po/stamp-cat-id 1998-12-30 07:50:01.000000000 +0000
5735--- lrzsz-0.12.20.orig/po/stamp-cat-id 5705+++ lrzsz-0.12.20/po/stamp-cat-id 1970-01-01 01:00:00.000000000 +0100
5736+++ /dev/null
5737@@ -1 +0,0 @@ 5706@@ -1 +0,0 @@
5738-timestamp 5707-timestamp
5739Index: lrzsz-0.12.20/po/stamp-po 5708diff -uprN clean/lrzsz-0.12.20/po/stamp-po lrzsz-0.12.20/po/stamp-po
5740=================================================================== 5709--- clean/lrzsz-0.12.20/po/stamp-po 1970-01-01 01:00:00.000000000 +0100
5741--- /dev/null 5710+++ lrzsz-0.12.20/po/stamp-po 2019-11-26 11:42:09.000000000 +0000
5742+++ lrzsz-0.12.20/po/stamp-po
5743@@ -0,0 +1 @@ 5711@@ -0,0 +1 @@
5744+timestamp 5712+timestamp
5745Index: lrzsz-0.12.20/src/Makefile.am 5713diff -uprN clean/lrzsz-0.12.20/src/Makefile.am lrzsz-0.12.20/src/Makefile.am
5746=================================================================== 5714--- clean/lrzsz-0.12.20/src/Makefile.am 1998-12-28 08:38:47.000000000 +0000
5747--- lrzsz-0.12.20.orig/src/Makefile.am 5715+++ lrzsz-0.12.20/src/Makefile.am 2019-11-25 16:22:49.000000000 +0000
5748+++ lrzsz-0.12.20/src/Makefile.am
5749@@ -2,13 +2,11 @@ bin_PROGRAMS=lrz lsz 5716@@ -2,13 +2,11 @@ bin_PROGRAMS=lrz lsz
5750 lrz_SOURCES=lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c 5717 lrz_SOURCES=lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
5751 lsz_SOURCES=lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c 5718 lsz_SOURCES=lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
@@ -5762,10 +5729,9 @@ Index: lrzsz-0.12.20/src/Makefile.am
5762 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in 5729 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
5763 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib 5730 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
5764 #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\" 5731 #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
5765Index: lrzsz-0.12.20/src/zglobal.h 5732diff -uprN clean/lrzsz-0.12.20/src/zglobal.h lrzsz-0.12.20/src/zglobal.h
5766=================================================================== 5733--- clean/lrzsz-0.12.20/src/zglobal.h 1998-12-29 12:34:59.000000000 +0000
5767--- lrzsz-0.12.20.orig/src/zglobal.h 5734+++ lrzsz-0.12.20/src/zglobal.h 2019-11-25 16:32:42.000000000 +0000
5768+++ lrzsz-0.12.20/src/zglobal.h
5769@@ -180,9 +180,6 @@ struct termios; 5735@@ -180,9 +180,6 @@ struct termios;
5770 #if HAVE_LOCALE_H 5736 #if HAVE_LOCALE_H
5771 # include <locale.h> 5737 # include <locale.h>
@@ -5776,9 +5742,8 @@ Index: lrzsz-0.12.20/src/zglobal.h
5776 5742
5777 #if ENABLE_NLS 5743 #if ENABLE_NLS
5778 # include <libintl.h> 5744 # include <libintl.h>
5779Index: lrzsz-0.12.20/stamp-h.in 5745diff -uprN clean/lrzsz-0.12.20/stamp-h.in lrzsz-0.12.20/stamp-h.in
5780=================================================================== 5746--- clean/lrzsz-0.12.20/stamp-h.in 1998-12-30 07:51:07.000000000 +0000
5781--- lrzsz-0.12.20.orig/stamp-h.in 5747+++ lrzsz-0.12.20/stamp-h.in 1970-01-01 01:00:00.000000000 +0100
5782+++ /dev/null
5783@@ -1 +0,0 @@ 5748@@ -1 +0,0 @@
5784-timestamp 5749-timestamp