From patchwork Wed Jul 5 16:34:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51576 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D453027BBE9; Wed, 5 Jul 2023 17:36:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 713D427BBE2 for ; Wed, 5 Jul 2023 17:36:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qH5TD-0001VO-De; Wed, 05 Jul 2023 12:35:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qH5T6-0001TT-05 for guix-patches@gnu.org; Wed, 05 Jul 2023 12:35:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qH5T5-0003QV-Cw for guix-patches@gnu.org; Wed, 05 Jul 2023 12:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qH5T4-0003A7-Eg for guix-patches@gnu.org; Wed, 05 Jul 2023 12:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64483] [PATCH 1/2] gnu: Add mactelnet. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jul 2023 16:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64483@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64483-submit@debbugs.gnu.org id=B64483.168857485712099 (code B ref 64483); Wed, 05 Jul 2023 16:35:02 +0000 Received: (at 64483) by debbugs.gnu.org; 5 Jul 2023 16:34:17 +0000 Received: from localhost ([127.0.0.1]:38869 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qH5SK-000393-RZ for submit@debbugs.gnu.org; Wed, 05 Jul 2023 12:34:17 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:49430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qH5SI-00038s-2G for 64483@debbugs.gnu.org; Wed, 05 Jul 2023 12:34:15 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id C0A6F20E86 for <64483@debbugs.gnu.org>; Wed, 5 Jul 2023 18:34:12 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 1F4BB80098; Wed, 5 Jul 2023 18:34:12 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id tfuqxRTM5y3q; Wed, 5 Jul 2023 18:34:11 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 5181F80060; Wed, 5 Jul 2023 18:34:11 +0200 (CEST) From: Bruno Victal Date: Wed, 5 Jul 2023 17:34:04 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (mactelnet): New variable. * gnu/packages/patches/mactelnet-remove-init.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 42 ++++++++ .../patches/mactelnet-remove-init.patch | 98 +++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 gnu/packages/patches/mactelnet-remove-init.patch base-commit: 67c276a870b9d6be69c2a9e867683e58928c38ef diff --git a/gnu/local.mk b/gnu/local.mk index 6470f1abd4..95f562e5c1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1558,6 +1558,7 @@ dist_patch_DATA = \ %D%/packages/patches/lua-5.4-liblua-so.patch \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/lvm2-static-link.patch \ + %D%/packages/patches/mactelnet-remove-init.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-rocksdb-atomic-linking.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index aea9efa4da..bbcd364dad 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2023 Lu Hui ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Alexey Abramov +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -5851,3 +5852,44 @@ (define-public du-dust (description "This package provides a graphical disk usage analyzer in text mode.") (license license:asl2.0))) + +(define-public mactelnet + (package + (name "mactelnet") + (version "0.4.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/haakonnessjoen/MAC-Telnet") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z63dz22crrvrm0sh2cwpyqb7wqd9m45m6f2641mwmyp6hcpf4k4")) + (patches (search-patches "mactelnet-remove-init.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f)) ; no tests + (native-inputs (list autoconf automake gettext-minimal)) + (synopsis "MAC-Telnet utilities for communicating with RouterOS devices") + (description "This package provides an implementation of the MAC-Telnet protocol +used by RouterOS devices. It provides the following commands: +@table @command +@item{macping} +Ping RouterOS devices or @command{mactelnetd} hosts. +@item{mactelnetd} +MAC-Telnet daemon. +@item{mactelnet} +MAC-Telnet client. +@item{mndp} +Discover other RouterOS devices or @command{mactelnetd} hosts. +@end table") + (home-page "https://lunatic.no/2010/10/routeros-mac-telnet-application-for-linux-users/") + (license + (list license:gpl2+ + ;; Note: applies to src/md5.{c,h} + ;; This file is likely to be gone in the next release. + license:zlib + ;; Bundled uthash-1.9.9. + license:bsd-2)))) diff --git a/gnu/packages/patches/mactelnet-remove-init.patch b/gnu/packages/patches/mactelnet-remove-init.patch new file mode 100644 index 0000000000..82372e3fe4 --- /dev/null +++ b/gnu/packages/patches/mactelnet-remove-init.patch @@ -0,0 +1,98 @@ +From ca2dff0b97df0ceb8f6357de3a4375ebc09646dd Mon Sep 17 00:00:00 2001 +Message-Id: +From: Bruno Victal +Date: Wed, 5 Jul 2023 16:43:31 +0100 +Subject: [PATCH] Skip installing init file. + +The file refers to hardcoded paths. +--- + Makefile.am | 2 +- + config/Makefile.am | 5 ----- + config/mactelnetd.init | 21 --------------------- + config/mactelnetd.users | 12 ------------ + configure.ac | 2 +- + 5 files changed, 2 insertions(+), 40 deletions(-) + delete mode 100644 config/Makefile.am + delete mode 100644 config/mactelnetd.init + delete mode 100644 config/mactelnetd.users + +diff --git a/Makefile.am b/Makefile.am +index 4e67178..264d8ea 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = src doc config po ++SUBDIRS = src doc po + + CFLAGS = --pedantic -Wall -std=c99 -O3 + LDFLAGS = +diff --git a/config/Makefile.am b/config/Makefile.am +deleted file mode 100644 +index 574a2e0..0000000 +--- a/config/Makefile.am ++++ /dev/null +@@ -1,5 +0,0 @@ +-dist_sysconf_DATA = mactelnetd.users +- +-install-exec-hook: +- chmod 600 $(DESTDIR)$(sysconfdir)/mactelnetd.users +- chown root $(DESTDIR)$(sysconfdir)/mactelnetd.users +diff --git a/config/mactelnetd.init b/config/mactelnetd.init +deleted file mode 100644 +index b7ddddf..0000000 +--- a/config/mactelnetd.init ++++ /dev/null +@@ -1,21 +0,0 @@ +-# mactelnetd - MAC-Telnet server +-# +-# The MAC-Telnet server provides telnet access via MAC addresses. +-# +-# Ubuntu upstart config: +- +-description "MAC-Telnet server" +- +-start on filesystem +-stop on runlevel [!2345] +- +-respawn +-respawn limit 10 5 +-umask 022 +- +-pre-start script +- test -O /etc/mactelnetd.users || { stop; exit 0; } +- test -x /usr/sbin/mactelnetd || { stop; exit 0; } +-end script +- +-exec /usr/sbin/mactelnetd -f +diff --git a/config/mactelnetd.users b/config/mactelnetd.users +deleted file mode 100644 +index c140e36..0000000 +--- a/config/mactelnetd.users ++++ /dev/null +@@ -1,12 +0,0 @@ +-# Users file for MAC-Telnetd +-# +-#################################################################### +-# WARNING: This file has passwords written in plain-text. # +-# Make sure this file is owned and only readable by root. # +-#################################################################### +-# +-# Each line consists of a username and a password seperated by :. +-# Usernames must be existing users from passwd. +-# +-# Format: +-#username:password +diff --git a/configure.ac b/configure.ac +index c0fdda4..9d2f7d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,4 +34,4 @@ AC_FUNC_MALLOC + AC_FUNC_STRNLEN + AC_CHECK_FUNCS([alarm bzero clock_gettime getpass gettimeofday inet_ntoa memset select setenv setlocale socket strcasecmp strerror strncasecmp sysinfo uname]) + +-AC_OUTPUT(Makefile src/Makefile doc/Makefile config/Makefile po/Makefile.in) ++AC_OUTPUT(Makefile src/Makefile doc/Makefile po/Makefile.in) +-- +2.40.1 +