summaryrefslogtreecommitdiff
path: root/misc/linm/files
diff options
context:
space:
mode:
Diffstat (limited to 'misc/linm/files')
-rw-r--r--misc/linm/files/patch-Makefile.in37
-rw-r--r--misc/linm/files/patch-lib_mlsdialog.h16
-rw-r--r--misc/linm/files/patch-panel_common_passencrypt.cpp48
-rw-r--r--misc/linm/files/patch-src_ncurses_Makefile.in11
4 files changed, 0 insertions, 112 deletions
diff --git a/misc/linm/files/patch-Makefile.in b/misc/linm/files/patch-Makefile.in
deleted file mode 100644
index 707a13b1266b..000000000000
--- a/misc/linm/files/patch-Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.in.orig Tue Jan 31 01:14:27 2006
-+++ Makefile.in Thu Feb 16 15:16:59 2006
-@@ -239,7 +239,7 @@
- # have all needed files, that a GNU package needs
- AUTOMAKE_OPTIONS = foreign 1.4
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = intl po lib panel editor src sh
-+SUBDIRS = po lib panel editor src sh
- noinst_DATA = README.ko_euckr README.ko_utf8 linm.spec debian/*
- EXTRA_DIST = config.rpath m4/ChangeLog $(noinst_DATA)
- all: config.h
-@@ -695,6 +695,10 @@
-
-
- install-exec-hook :
-+ if ! test -d $(DESTDIR)$(sysconfdir)/profile.d ; then \
-+ install -d -m 755 $(DESTDIR)$(sysconfdir)/profile.d \
-+ ; fi
-+
- if test -d $(DESTDIR)$(sysconfdir)/profile.d ; then \
- if test -w $(DESTDIR)$(sysconfdir)/profile.d ; then \
- install -c -m 755 $(top_srcdir)/sh/linm_alias.sh $(DESTDIR)$(sysconfdir)/profile.d \
-@@ -710,14 +714,6 @@
- $(top_srcdir)/sh/colorset.cfg \
- $(top_srcdir)/sh/keyset.cfg \
- $(DESTDIR)$(LINM_CFGPATH) \
-- ; else \
-- if ! test -d ~/.linm ; then \
-- install -d -m 755 ~/.linm \
-- ; fi && \
-- install -c -m 644 $(top_srcdir)/sh/default.cfg \
-- $(top_srcdir)/sh/colorset.cfg \
-- $(top_srcdir)/sh/keyset.cfg \
-- ~/.linm \
- ; fi
-
- if ! test -d $(DESTDIR)$(datadir)/pixmaps ; then \
diff --git a/misc/linm/files/patch-lib_mlsdialog.h b/misc/linm/files/patch-lib_mlsdialog.h
deleted file mode 100644
index c9d5ee95c5d2..000000000000
--- a/misc/linm/files/patch-lib_mlsdialog.h
+++ /dev/null
@@ -1,16 +0,0 @@
-In file included from mlsdialog.cpp:1:
-./mlsdialog.h:30:10: error: cannot initialize return object of type 'void *' with an rvalue of type 'bool'
- return false;
- ^~~~~
-
---- lib/mlsdialog.h.orig 2018-08-30 11:11:28 UTC
-+++ lib/mlsdialog.h
-@@ -27,7 +27,7 @@ class MlsDialog (public)
- virtual void* MsgWaitBox(const string& sTitle, const string& sMsg)
- {
- cout << "MsgWaitBox :: " << sTitle << "Msg :: " << sMsg << endl;
-- return false;
-+ return NULL;
- }
- virtual void MsgWaitEnd(void* ) {}
- virtual int InputBox(const string& sTitle, string& sInputStr, bool /*bPasswd*/ = false)
diff --git a/misc/linm/files/patch-panel_common_passencrypt.cpp b/misc/linm/files/patch-panel_common_passencrypt.cpp
deleted file mode 100644
index 8bbfe7550371..000000000000
--- a/misc/linm/files/patch-panel_common_passencrypt.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- panel/common/passencrypt.cpp.orig 2007-11-24 13:03:32 UTC
-+++ panel/common/passencrypt.cpp
-@@ -64,9 +64,9 @@ char PasswdCrypt::HexValue(char c)
- void PasswdCrypt::DesECBEncode(const string& sKeyHex, const string& sDecode, string& sEncode)
- {
- #ifdef __LINM_SFTP_USE__
-- des_key_schedule tKeySchedule;
-+ DES_key_schedule tKeySchedule;
-
-- des_cblock tHexBlock, tSrcBlock, tDecBlock;
-+ DES_cblock tHexBlock, tSrcBlock, tDecBlock;
- char cHexa[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
- unsigned char cMask[2] = {0xF0, 0x0F};
- char cEncode[17];
-@@ -93,8 +93,8 @@ void PasswdCrypt::DesECBEncode(const str
- tSrcBlock[i] = (unsigned char)' ';
- }
-
-- des_set_key((const_des_cblock*)&tHexBlock, tKeySchedule);
-- des_ecb_encrypt((const_des_cblock*)&tSrcBlock, &tDecBlock, tKeySchedule, DES_ENCRYPT);
-+ DES_set_key((const_DES_cblock*)&tHexBlock, &tKeySchedule);
-+ DES_ecb_encrypt((const_DES_cblock*)&tSrcBlock, &tDecBlock, &tKeySchedule, DES_ENCRYPT);
-
- for(i=0; i<8; i++)
- {
-@@ -110,9 +110,9 @@ void PasswdCrypt::DesECBEncode(const str
- void PasswdCrypt::DesECBDecode(const string& sKeyHex, const string& sEncode, string& sDecode)
- {
- #ifdef __LINM_SFTP_USE__
-- des_key_schedule tKeySchedule;
-+ DES_key_schedule tKeySchedule;
-
-- des_cblock tKeyBlock, tEncBlock, tDecBlock;
-+ DES_cblock tKeyBlock, tEncBlock, tDecBlock;
- char cKeyHex[16];
- char cEncode[16];
- int i;
-@@ -133,8 +133,8 @@ void PasswdCrypt::DesECBDecode(const str
- HEX2BYTE(*(tEncBlock+i), cEncode+i*2);
- }
-
-- des_set_key((const_des_cblock*)&tKeyBlock, tKeySchedule);
-- des_ecb_encrypt((const_des_cblock*)&tEncBlock, &tDecBlock, tKeySchedule, DES_DECRYPT);
-+ DES_set_key((const_DES_cblock*)&tKeyBlock, &tKeySchedule);
-+ DES_ecb_encrypt((const_DES_cblock*)&tEncBlock, &tDecBlock, &tKeySchedule, DES_DECRYPT);
-
- sDecode = "";
- for(i=0; i<8; i++)
diff --git a/misc/linm/files/patch-src_ncurses_Makefile.in b/misc/linm/files/patch-src_ncurses_Makefile.in
deleted file mode 100644
index 34264b0b36f0..000000000000
--- a/misc/linm/files/patch-src_ncurses_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ncurses/Makefile.in.orig 2018-08-30 11:32:53 UTC
-+++ src/ncurses/Makefile.in
-@@ -279,7 +279,7 @@ linm_LDADD = $(top_builddir)/lib/libmlscommon.a \
- $(top_builddir)/editor/libeditor.a \
- $(top_builddir)/panel/common/libpanelcommon.a \
- $(top_builddir)/panel/vfs/archive/liblinmpluginarc.la \
-- $(top_builddir)/panel/vfs/ftp/liblinmpluginftp.la @LIBINTL@ \
-+ $(top_builddir)/panel/vfs/ftp/liblinmpluginftp.la @LIBICONV@ @LIBINTL@ \
- $(am__append_1) $(am__append_2)
- all: all-recursive
-