summaryrefslogtreecommitdiff
path: root/libre/mc
diff options
context:
space:
mode:
Diffstat (limited to 'libre/mc')
-rw-r--r--libre/mc/0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch26
-rw-r--r--libre/mc/0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch68
-rw-r--r--libre/mc/PKGBUILD8
-rw-r--r--libre/mc/libre.patch120
4 files changed, 54 insertions, 168 deletions
diff --git a/libre/mc/0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch b/libre/mc/0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch
deleted file mode 100644
index c711ee55d..000000000
--- a/libre/mc/0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 52871230a295311c286bb92feddc469e3ece11d6 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Mon, 13 Jun 2016 09:21:15 +0300
-Subject: [PATCH 1/2] Ticket #3639: fix window resizing when panels are hidden.
-
-This reverts commit f278eaec99320874b112b37d9925d78d964f5d37.
----
- src/subshell/common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/subshell/common.c b/src/subshell/common.c
-index 6667b6e..98968fa 100644
---- a/src/subshell/common.c
-+++ b/src/subshell/common.c
-@@ -531,7 +531,7 @@ feed_subshell (int how, gboolean fail_on_error)
- /* Despite using SA_RESTART, we still have to check for this */
- if (errno == EINTR)
- {
-- if (how == QUIETLY && mc_global.tty.winch_flag != 0)
-+ if (mc_global.tty.winch_flag != 0)
- tty_change_screen_size ();
-
- continue; /* try all over again */
---
-2.10.0
-
diff --git a/libre/mc/0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch b/libre/mc/0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch
deleted file mode 100644
index ea4f21116..000000000
--- a/libre/mc/0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 968882335abb18e69be39dc4fd444f78f0a14a0f Mon Sep 17 00:00:00 2001
-From: Yuri Khan <yurivkhan@gmail.com>
-Date: Mon, 9 May 2016 18:04:21 +0600
-Subject: [PATCH 2/2] Do not botch SIGWINCH delivery to the subshell.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/tty/tty-slang.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c
-index 143a6d3..87e4a70 100644
---- a/lib/tty/tty-slang.c
-+++ b/lib/tty/tty-slang.c
-@@ -83,6 +83,8 @@ static struct termios new_mode;
- /* Controls whether we should wait for input in tty_lowlevel_getch */
- static gboolean no_slang_delay;
-
-+static gboolean slsmg_active = FALSE;
-+
- /* This table describes which capabilities we want and which values we
- * assign to them.
- */
-@@ -329,6 +331,7 @@ tty_init (gboolean mouse_enable, gboolean is_xterm)
- tty_display_8bit (FALSE);
-
- SLsmg_init_smg ();
-+ slsmg_active = TRUE;
- if (!mouse_enable)
- use_mouse_p = MOUSE_DISABLED;
- tty_init_xterm_support (is_xterm); /* do it before tty_enter_ca_mode() call */
-@@ -354,6 +357,7 @@ tty_shutdown (void)
- tty_reset_screen ();
- tty_exit_ca_mode ();
- SLang_reset_tty ();
-+ slsmg_active = FALSE;
-
- /* Load the op capability to reset the colors to those that were
- * active when the program was started up
-@@ -388,7 +392,8 @@ void
- tty_change_screen_size (void)
- {
- SLtt_get_screen_size ();
-- SLsmg_reinit_smg ();
-+ if (slsmg_active)
-+ SLsmg_reinit_smg ();
-
- #ifdef ENABLE_SUBSHELL
- if (mc_global.tty.use_subshell)
-@@ -404,6 +409,7 @@ tty_reset_prog_mode (void)
- {
- tcsetattr (SLang_TT_Read_FD, TCSANOW, &new_mode);
- SLsmg_init_smg ();
-+ slsmg_active = TRUE;
- SLsmg_touch_lines (0, LINES);
- }
-
-@@ -504,6 +510,7 @@ int
- tty_reset_screen (void)
- {
- SLsmg_reset_smg ();
-+ slsmg_active = FALSE;
- return 0; /* OK */
- }
-
---
-2.10.0
-
diff --git a/libre/mc/PKGBUILD b/libre/mc/PKGBUILD
index c772062b6..612bc58b6 100644
--- a/libre/mc/PKGBUILD
+++ b/libre/mc/PKGBUILD
@@ -6,8 +6,8 @@
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
pkgname=mc
-pkgver=4.8.19
-pkgrel=1.parabola2
+pkgver=4.8.20
+pkgrel=1.parabola1
pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar support removed"
arch=('i686' 'x86_64' 'armv7h')
url="http://www.ibiblio.org/mc/"
@@ -40,8 +40,8 @@ backup=('etc/mc/edit.indent.rc'
options=('!emptydirs')
source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"
'libre.patch')
-sha256sums=('eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df'
- 'a72558445fd1558e18d0fb0be767f4460d04130e80cd87ad84b376fab1b66357')
+sha256sums=('017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c'
+ '09a44d10ed1081ada579dd42fb67cdea8755f4a3aa496433df9a726b90f11862')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/libre/mc/libre.patch b/libre/mc/libre.patch
index 42d45afe8..de681f128 100644
--- a/libre/mc/libre.patch
+++ b/libre/mc/libre.patch
@@ -1,8 +1,6 @@
-diff --git a/configure b/configure
-index 616db44..0c6e746 100755
---- a/configure
-+++ b/configure
-@@ -30291,7 +30291,7 @@ _ACEOF
+--- a/configure 2017-11-25 13:33:45.000000000 -0500
++++ b/configure 2018-01-17 13:10:33.355116203 -0500
+@@ -30379,7 +30379,7 @@
ac_config_files="$ac_config_files src/man2hlp/man2hlp"
@@ -10,8 +8,8 @@ index 616db44..0c6e746 100755
+ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in"
- if test x$enable_tests != xno; then
-@@ -31560,7 +31560,6 @@ do
+ ac_config_files="$ac_config_files tests/Makefile tests/lib/Makefile tests/lib/mcconfig/Makefile tests/lib/search/Makefile tests/lib/strutil/Makefile tests/lib/vfs/Makefile tests/lib/widget/Makefile tests/src/Makefile tests/src/filemanager/Makefile tests/src/editor/Makefile tests/src/editor/test-data.txt tests/src/vfs/Makefile tests/src/vfs/extfs/Makefile tests/src/vfs/extfs/helpers-list/Makefile tests/src/vfs/extfs/helpers-list/data/config.sh tests/src/vfs/extfs/helpers-list/misc/Makefile"
+@@ -31646,7 +31646,6 @@
"src/vfs/extfs/helpers/patchfs") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/patchfs" ;;
"src/vfs/extfs/helpers/rpms+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/rpms+" ;;
"src/vfs/extfs/helpers/s3+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/s3+" ;;
@@ -19,7 +17,7 @@ index 616db44..0c6e746 100755
"src/vfs/extfs/helpers/ualz") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ualz" ;;
"src/vfs/extfs/helpers/uar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uar" ;;
"src/vfs/extfs/helpers/uarc") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uarc" ;;
-@@ -31570,7 +31569,6 @@ do
+@@ -31656,7 +31655,6 @@
"src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;;
"src/vfs/extfs/helpers/ulha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulha" ;;
"src/vfs/extfs/helpers/ulib") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulib" ;;
@@ -27,11 +25,9 @@ index 616db44..0c6e746 100755
"src/vfs/extfs/helpers/uzip") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzip" ;;
"src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;;
"src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;;
-diff --git a/configure.ac b/configure.ac
-index 82f82c0..801c3be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -552,7 +552,6 @@ src/vfs/extfs/helpers/mailfs
+--- a/configure.ac 2017-11-18 12:45:59.000000000 -0500
++++ b/configure.ac 2018-01-17 13:13:08.044979701 -0500
+@@ -568,7 +568,6 @@
src/vfs/extfs/helpers/patchfs
src/vfs/extfs/helpers/rpms+
src/vfs/extfs/helpers/s3+
@@ -39,7 +35,7 @@ index 82f82c0..801c3be 100644
src/vfs/extfs/helpers/ualz
src/vfs/extfs/helpers/uar
src/vfs/extfs/helpers/uarc
-@@ -562,7 +561,6 @@ src/vfs/extfs/helpers/ucab
+@@ -578,7 +577,6 @@
src/vfs/extfs/helpers/uha
src/vfs/extfs/helpers/ulha
src/vfs/extfs/helpers/ulib
@@ -47,11 +43,9 @@ index 82f82c0..801c3be 100644
src/vfs/extfs/helpers/uzip
src/vfs/extfs/helpers/uzoo
-diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh
-index e6105fd..ebf6b52 100755
---- a/misc/ext.d/archive.sh
-+++ b/misc/ext.d/archive.sh
-@@ -75,8 +75,7 @@ do_view_action() {
+--- a/misc/ext.d/archive.sh 2017-02-24 15:25:57.000000000 -0500
++++ b/misc/ext.d/archive.sh 2018-01-17 13:15:10.486261473 -0500
+@@ -75,8 +75,7 @@
lha l "${MC_EXT_FILENAME}"
;;
arj)
@@ -61,7 +55,7 @@ index e6105fd..ebf6b52 100755
;;
cab)
cabextract -l "${MC_EXT_FILENAME}"
-@@ -84,10 +83,6 @@ do_view_action() {
+@@ -84,10 +83,6 @@
ha)
ha lf "${MC_EXT_FILENAME}"
;;
@@ -72,7 +66,7 @@ index e6105fd..ebf6b52 100755
alz)
unalz -l "${MC_EXT_FILENAME}"
;;
-@@ -115,9 +110,6 @@ do_view_action() {
+@@ -115,9 +110,6 @@
7z l "${MC_EXT_FILENAME}"
;;
@@ -82,24 +76,20 @@ index e6105fd..ebf6b52 100755
arc)
arc l "${MC_EXT_FILENAME}"
;;
-diff --git a/misc/filehighlight.ini b/misc/filehighlight.ini
-index 7c59474..b579925 100644
---- a/misc/filehighlight.ini
-+++ b/misc/filehighlight.ini
+--- a/misc/filehighlight.ini 2017-11-18 12:45:59.000000000 -0500
++++ b/misc/filehighlight.ini 2018-01-17 13:16:59.554798037 -0500
@@ -28,7 +28,7 @@
regexp=(^#.*|.*~$)
[archive]
-- extensions=7z;Z;ace;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;xz;zip;zoo
-+ extensions=7z;Z;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;xz;zip;zoo
+- extensions=7z;Z;ace;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;xz;zip;zoo
++ extensions=7z;Z;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;txz;xz;zip;zoo
[doc]
extensions=chm;css;ctl;diz;doc;docm;docx;dtd;htm;html;letter;lsm;mail;man;me;msg;nroff;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt
-diff --git a/misc/mc.ext.in b/misc/mc.ext.in
-index 92f908b..41e1ca1 100644
---- a/misc/mc.ext.in
-+++ b/misc/mc.ext.in
-@@ -185,11 +185,6 @@ shell/i/.ha
+--- a/misc/mc.ext.in 2017-02-24 15:25:57.000000000 -0500
++++ b/misc/mc.ext.in 2018-01-17 13:18:13.904861498 -0500
+@@ -185,11 +185,6 @@
Open=%cd %p/uha://
View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha
@@ -111,7 +101,7 @@ index 92f908b..41e1ca1 100644
# ALZip
shell/i/.alz
Open=%cd %p/ualz://
-@@ -706,12 +701,6 @@ shell/i/.torrent
+@@ -706,12 +701,6 @@
### Plain compressed files ###
@@ -124,11 +114,9 @@ index 92f908b..41e1ca1 100644
# arc
shell/i/.arc
Open=%cd %p/uarc://
-diff --git a/misc/syntax/php.syntax b/misc/syntax/php.syntax
-index 008bf31..fd16aec 100644
---- a/misc/syntax/php.syntax
-+++ b/misc/syntax/php.syntax
-@@ -2174,22 +2174,6 @@ context default
+--- a/misc/syntax/php.syntax 2017-11-18 12:45:59.000000000 -0500
++++ b/misc/syntax/php.syntax 2018-01-17 13:19:14.398867675 -0500
+@@ -2177,22 +2177,6 @@
# Radius constants
keyword whole RADIUS\_\[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_\] white
@@ -151,11 +139,9 @@ index 008bf31..fd16aec 100644
# GNU Readline
keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow
-diff --git a/misc/syntax/sh.syntax b/misc/syntax/sh.syntax
-index ff9ba2b..74c1a1e 100644
---- a/misc/syntax/sh.syntax
-+++ b/misc/syntax/sh.syntax
-@@ -610,7 +610,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+--- a/misc/syntax/sh.syntax 2017-02-24 15:25:57.000000000 -0500
++++ b/misc/syntax/sh.syntax 2018-01-17 13:20:38.588498398 -0500
+@@ -610,7 +610,6 @@
keyword whole pwunconv cyan
keyword whole ramsize cyan
keyword whole ranlib cyan
@@ -163,7 +149,7 @@ index ff9ba2b..74c1a1e 100644
keyword whole rarp cyan
keyword whole raw cyan
keyword whole rbash cyan
-@@ -782,7 +781,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+@@ -782,7 +781,6 @@
keyword whole ul cyan
keyword whole umount cyan
keyword whole uname cyan
@@ -171,7 +157,7 @@ index ff9ba2b..74c1a1e 100644
keyword whole uncompress cyan
keyword whole unexpand cyan
keyword whole unicode_start cyan
-@@ -1714,7 +1712,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+@@ -1714,7 +1712,6 @@
keyword whole pwunconv cyan
keyword whole ramsize cyan
keyword whole ranlib cyan
@@ -179,7 +165,7 @@ index ff9ba2b..74c1a1e 100644
keyword whole rarp cyan
keyword whole raw cyan
keyword whole rbash cyan
-@@ -1886,7 +1883,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
+@@ -1886,7 +1883,6 @@
keyword whole ul cyan
keyword whole umount cyan
keyword whole uname cyan
@@ -187,11 +173,9 @@ index ff9ba2b..74c1a1e 100644
keyword whole uncompress cyan
keyword whole unexpand cyan
keyword whole unicode_start cyan
-diff --git a/src/vfs/extfs/helpers/Makefile.am b/src/vfs/extfs/helpers/Makefile.am
-index 06ea789..099acf1 100644
---- a/src/vfs/extfs/helpers/Makefile.am
-+++ b/src/vfs/extfs/helpers/Makefile.am
-@@ -24,7 +24,6 @@ EXTFS_IN = \
+--- a/src/vfs/extfs/helpers/Makefile.am 2017-02-24 15:25:57.000000000 -0500
++++ b/src/vfs/extfs/helpers/Makefile.am 2018-01-17 13:22:02.854792416 -0500
+@@ -24,7 +24,6 @@
patchfs.in \
rpms+.in \
s3+.in \
@@ -199,7 +183,7 @@ index 06ea789..099acf1 100644
ualz.in \
uar.in \
uarc.in \
-@@ -34,7 +33,6 @@ EXTFS_IN = \
+@@ -34,7 +33,6 @@
uha.in \
ulha.in \
ulib.in \
@@ -207,7 +191,7 @@ index 06ea789..099acf1 100644
uzip.in \
uzoo.in
-@@ -54,7 +52,6 @@ EXTFS_OUT = \
+@@ -54,7 +52,6 @@
patchfs \
rpms+ \
s3+ \
@@ -215,7 +199,7 @@ index 06ea789..099acf1 100644
ualz \
uar \
uarc \
-@@ -64,7 +61,6 @@ EXTFS_OUT = \
+@@ -64,7 +61,6 @@
uha \
ulha \
ulib \
@@ -223,11 +207,9 @@ index 06ea789..099acf1 100644
uzip \
uzoo
-diff --git a/src/vfs/extfs/helpers/Makefile.in b/src/vfs/extfs/helpers/Makefile.in
-index cd29bf4..3af7330 100644
---- a/src/vfs/extfs/helpers/Makefile.in
-+++ b/src/vfs/extfs/helpers/Makefile.in
-@@ -152,8 +152,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+--- a/src/vfs/extfs/helpers/Makefile.in 2017-11-25 13:33:53.000000000 -0500
++++ b/src/vfs/extfs/helpers/Makefile.in 2018-01-17 13:26:22.653366629 -0500
+@@ -154,8 +154,8 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = a+ apt+ audio deb deba debd dpkg+ iso9660 hp48+ \
@@ -238,7 +220,7 @@ index cd29bf4..3af7330 100644
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
-@@ -211,10 +211,10 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/a+.in \
+@@ -213,10 +213,10 @@
$(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \
$(srcdir)/hp48+.in $(srcdir)/iso9660.in $(srcdir)/lslR.in \
$(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \
@@ -251,7 +233,7 @@ index cd29bf4..3af7330 100644
$(srcdir)/uzip.in $(srcdir)/uzoo.in README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-@@ -473,7 +473,6 @@ EXTFS_IN = \
+@@ -475,7 +475,6 @@
patchfs.in \
rpms+.in \
s3+.in \
@@ -259,7 +241,7 @@ index cd29bf4..3af7330 100644
ualz.in \
uar.in \
uarc.in \
-@@ -483,7 +482,6 @@ EXTFS_IN = \
+@@ -485,7 +484,6 @@
uha.in \
ulha.in \
ulib.in \
@@ -267,7 +249,7 @@ index cd29bf4..3af7330 100644
uzip.in \
uzoo.in
-@@ -504,7 +502,6 @@ EXTFS_OUT = \
+@@ -506,7 +504,6 @@
patchfs \
rpms+ \
s3+ \
@@ -275,7 +257,7 @@ index cd29bf4..3af7330 100644
ualz \
uar \
uarc \
-@@ -514,7 +511,6 @@ EXTFS_OUT = \
+@@ -516,7 +513,6 @@
uha \
ulha \
ulib \
@@ -283,7 +265,7 @@ index cd29bf4..3af7330 100644
uzip \
uzoo
-@@ -583,8 +579,6 @@ rpms+: $(top_builddir)/config.status $(srcdir)/rpms+.in
+@@ -585,8 +581,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
s3+: $(top_builddir)/config.status $(srcdir)/s3+.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -292,7 +274,7 @@ index cd29bf4..3af7330 100644
ualz: $(top_builddir)/config.status $(srcdir)/ualz.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
uar: $(top_builddir)/config.status $(srcdir)/uar.in
-@@ -603,8 +597,6 @@ ulha: $(top_builddir)/config.status $(srcdir)/ulha.in
+@@ -605,8 +599,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
ulib: $(top_builddir)/config.status $(srcdir)/ulib.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -301,10 +283,8 @@ index cd29bf4..3af7330 100644
uzip: $(top_builddir)/config.status $(srcdir)/uzip.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
uzoo: $(top_builddir)/config.status $(srcdir)/uzoo.in
-diff --git a/src/vfs/extfs/helpers/uarj.in b/src/vfs/extfs/helpers/uarj.in
-index 15549a0..7dffc37 100644
---- a/src/vfs/extfs/helpers/uarj.in
-+++ b/src/vfs/extfs/helpers/uarj.in
+--- a/src/vfs/extfs/helpers/uarj.in 2017-02-24 15:25:57.000000000 -0500
++++ b/src/vfs/extfs/helpers/uarj.in 2018-01-17 13:28:05.322184649 -0500
@@ -3,9 +3,8 @@
# Written by Viatcheslav Odintsov (2:5020/181)
# (C) 2002 ARJ Software Russia.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 13:56:45 +0000