From patchwork Sat Jun 13 22:13:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3205 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49ksLZ4832z3wdc for ; Sat, 13 Jun 2020 22:13:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49ksLW6N6GzBY; Sat, 13 Jun 2020 22:13:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49ksLW3ptQz2yT0; Sat, 13 Jun 2020 22:13:39 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49ksLV1vhZz2xk6 for ; Sat, 13 Jun 2020 22:13:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49ksLS5j3xzBY for ; Sat, 13 Jun 2020 22:13:36 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1592086416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=5cmVPoASU+m/Q3JTeHBr8ekDGtSCYxf7cN33lKv30hY=; b=yrOr+/L1UnHyLR46y23psDqHsoZPFRykmDMOH0MllUrf9LOcAKpILdDCzvjv3R6JxeainN LcV9n8++ONm0s0Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1592086416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=5cmVPoASU+m/Q3JTeHBr8ekDGtSCYxf7cN33lKv30hY=; b=KzaemB2kGaQ2KoQRvYR3CTrxvG753nVErttnloHKVM+u3GTv6A94vEolaXnAoplRX7vKGb aLPfE7fiwP8FpVjQ4Gv2ygtXZto/f4WlEdui64A5l13Ac5iRCdxAKwL5tEjs0pYdMZbtW9 LAIXDJQIisac6Gdpz7TvuQ+fh4HcdaUZYrGWJ2UOt6rzGPFj0RyX1lM0p7sNi7aw//RHG2 uaydbNC93H5toMCmCtePWXp9GahvqzYCrz0TwkZpgUOymCcqtODfukHNDsUC/ZxMAzjmxl knS1FeDz07u+mzWfzZa9XZBbIUXjBxQukyhz6SSBMHx4btzIzWkgGRP3Ks6kRg== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] joe: Update to 4.6 Date: Sun, 14 Jun 2020 00:13:30 +0200 Message-Id: <20200613221330.21981-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" For details see: https://joe-editor.sourceforge.io/NEWS.html Signed-off-by: Matthias Fischer --- config/rootfiles/packages/joe | 69 +++++++++++++++++++++++++++++++---- lfs/joe | 8 ++-- 2 files changed, 65 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/joe b/config/rootfiles/packages/joe index 164ec79d9..5cc7a8d60 100644 --- a/config/rootfiles/packages/joe +++ b/config/rootfiles/packages/joe @@ -3,75 +3,128 @@ usr/bin/joe #usr/bin/jpico #usr/bin/jstar usr/bin/rjoe -#usr/bin/termidx #usr/etc/joe usr/etc/joe/ftyperc usr/etc/joe/jicerc.ru usr/etc/joe/jmacsrc usr/etc/joe/joerc +usr/etc/joe/joerc.zh_TW usr/etc/joe/jpicorc usr/etc/joe/jstarrc usr/etc/joe/rjoerc +usr/etc/joe/shell.csh +usr/etc/joe/shell.sh +#usr/share/applications/jmacs.desktop +#usr/share/applications/joe.desktop +#usr/share/applications/jpico.desktop +#usr/share/applications/jstar.desktop #usr/share/doc/joe #usr/share/doc/joe/ChangeLog -#usr/share/doc/joe/HACKING -#usr/share/doc/joe/HINTS -#usr/share/doc/joe/LIST -#usr/share/doc/joe/NEWS -#usr/share/doc/joe/README +#usr/share/doc/joe/NEWS.md +#usr/share/doc/joe/README.md +#usr/share/doc/joe/README.old +#usr/share/doc/joe/hacking.md +#usr/share/doc/joe/man.md #usr/share/joe #usr/share/joe/charmaps usr/share/joe/charmaps/klingon +usr/share/joe/colors +usr/share/joe/colors/default.jcf +usr/share/joe/colors/gruvbox.jcf +usr/share/joe/colors/ir_black.jcf +usr/share/joe/colors/molokai.jcf +usr/share/joe/colors/solarized.jcf +usr/share/joe/colors/wombat.jcf +usr/share/joe/colors/xoria.jcf +usr/share/joe/colors/zenburn-hc.jcf +usr/share/joe/colors/zenburn.jcf #usr/share/joe/lang usr/share/joe/lang/de.po #usr/share/joe/lang/fr.po #usr/share/joe/lang/ru.po usr/share/joe/lang/uk.po +usr/share/joe/lang/zh_TW.po #usr/share/joe/syntax usr/share/joe/syntax/4gl.jsf usr/share/joe/syntax/ada.jsf +usr/share/joe/syntax/ant.jsf usr/share/joe/syntax/asm.jsf +usr/share/joe/syntax/avr.jsf usr/share/joe/syntax/awk.jsf +usr/share/joe/syntax/batch.jsf usr/share/joe/syntax/c.jsf +usr/share/joe/syntax/clojure.jsf usr/share/joe/syntax/cobol.jsf +usr/share/joe/syntax/coffee.jsf +usr/share/joe/syntax/comment_todo.jsf usr/share/joe/syntax/conf.jsf +usr/share/joe/syntax/context.jsf usr/share/joe/syntax/csh.jsf +usr/share/joe/syntax/csharp.jsf usr/share/joe/syntax/css.jsf +usr/share/joe/syntax/d.jsf +usr/share/joe/syntax/debian.jsf usr/share/joe/syntax/diff.jsf +usr/share/joe/syntax/dockerfile.jsf +usr/share/joe/syntax/elixir.jsf +usr/share/joe/syntax/erb.jsf +usr/share/joe/syntax/erlang.jsf +usr/share/joe/syntax/filename.jsf usr/share/joe/syntax/fortran.jsf +usr/share/joe/syntax/git-commit.jsf +usr/share/joe/syntax/go.jsf +usr/share/joe/syntax/groovy.jsf +usr/share/joe/syntax/haml.jsf usr/share/joe/syntax/haskell.jsf usr/share/joe/syntax/html.jsf +usr/share/joe/syntax/htmlerb.jsf +usr/share/joe/syntax/ini.jsf +usr/share/joe/syntax/iptables.jsf usr/share/joe/syntax/java.jsf +usr/share/joe/syntax/jcf.jsf usr/share/joe/syntax/joerc.jsf +usr/share/joe/syntax/js.jsf usr/share/joe/syntax/jsf.jsf usr/share/joe/syntax/jsf_check.jsf +usr/share/joe/syntax/json.jsf usr/share/joe/syntax/lisp.jsf usr/share/joe/syntax/lua.jsf usr/share/joe/syntax/m4.jsf usr/share/joe/syntax/mail.jsf usr/share/joe/syntax/mason.jsf usr/share/joe/syntax/matlab.jsf +usr/share/joe/syntax/md.jsf usr/share/joe/syntax/ocaml.jsf usr/share/joe/syntax/pascal.jsf usr/share/joe/syntax/perl.jsf usr/share/joe/syntax/php.jsf +usr/share/joe/syntax/powershell.jsf +usr/share/joe/syntax/prolog.jsf +usr/share/joe/syntax/properties.jsf usr/share/joe/syntax/ps.jsf +usr/share/joe/syntax/puppet.jsf usr/share/joe/syntax/python.jsf +usr/share/joe/syntax/r.jsf usr/share/joe/syntax/rexx.jsf usr/share/joe/syntax/ruby.jsf +usr/share/joe/syntax/rust.jsf +usr/share/joe/syntax/scala.jsf usr/share/joe/syntax/sed.jsf usr/share/joe/syntax/sh.jsf +usr/share/joe/syntax/sieve.jsf usr/share/joe/syntax/skill.jsf usr/share/joe/syntax/sml.jsf usr/share/joe/syntax/spec.jsf usr/share/joe/syntax/sql.jsf +usr/share/joe/syntax/swift.jsf usr/share/joe/syntax/tcl.jsf usr/share/joe/syntax/tex.jsf usr/share/joe/syntax/troff.jsf +usr/share/joe/syntax/typescript.jsf usr/share/joe/syntax/verilog.jsf usr/share/joe/syntax/vhdl.jsf +usr/share/joe/syntax/whitespace.jsf usr/share/joe/syntax/xml.jsf +usr/share/joe/syntax/yaml.jsf usr/share/man/man1/joe.1 -#usr/share/man/ru -#usr/share/man/ru/man1 #usr/share/man/ru/man1/joe.1 diff --git a/lfs/joe b/lfs/joe index 70e8d735b..d89b44790 100644 --- a/lfs/joe +++ b/lfs/joe @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.7 +VER = 4.6 THISAPP = joe-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = joe -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 66de1b073e869ba12abbfcde3885c577 +$(DL_FILE)_MD5 = 9017484e6116830d846678b625ea5c43 install : $(TARGET)