| Message ID | 20200730222211.32082-1-smooky@v16.de |
|---|---|
| State | Accepted |
| Commit | 6992457365975db987b56a792d017099b71a995a |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 4BHlKN5sf6z3wdN for <patchwork@web04.haj.ipfire.org>; Thu, 30 Jul 2020 22:22:48 +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 4BHlKM1vnNzSD; Thu, 30 Jul 2020 22:22:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BHlKM0bhSz2xrL; Thu, 30 Jul 2020 22:22:47 +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 4BHlKK5Q2nz2xZx for <development@lists.ipfire.org>; Thu, 30 Jul 2020 22:22:45 +0000 (UTC) Received: from malta2912.startdedicated.de (malta2912.startdedicated.de [85.93.91.151]) (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 ESMTPS id 4BHlKD32XLzSD for <development@lists.ipfire.org>; Thu, 30 Jul 2020 22:22:40 +0000 (UTC) Received: from router.home.v16.de (unknown [31.16.178.110]) (Authenticated sender: smooky.v16) by malta2912.startdedicated.de (Postfix) with ESMTPA id A5670EC192E; Fri, 31 Jul 2020 00:22:32 +0200 (CEST) From: smooky@v16.de To: development@lists.ipfire.org Subject: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan. Date: Fri, 31 Jul 2020 00:22:11 +0200 Message-Id: <20200730222211.32082-1-smooky@v16.de> X-Mailer: git-send-email 2.12.2 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1596147760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=n1CZJ+4ggqwdMwzGKWxqecanuVOayPesYHXKqZKJizs=; b=H2EWViXUCGG+ody818WJdfscyRPw7r1PJ3gU8bKp8vwifr3SexXceNAsvIV7Wxu137uUby CZE9DIk3oq/JfKvt3NgeTLaB5AbZSsHQEy5uc2OOmuOsFxbi9YTPdvL+XKDDgPW5vGcgsJ 7p6FwyLX+P36XE03LENFnsihhG9JvLds1czK3GpgMnarFWHVWD/VsYW+Z1DLchJhtQLYiC S3dYLcrGTOmu0ficFydOC2OWHR4i55N5xc3M3p6MYDam8mw6WTHbDbpas5mX5s+HnFeOSV PYJR4WsnQQ4mPCMH7EY4STZTffDL0vMdIdus4xwRrhZe3pbcO+7dwHYutHwolA== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1596147760; a=rsa-sha256; cv=none; b=RY/+Fg2CUSK21P8OqxZ9kVdIN+lYJSWngPOh5jbi6aP0AXJmCDkBy3PZJCchuu+vAB5cGy Ckx2EsLqpNMuEo2mqzyeiFq6dDlo31OUs60hCvtZmI1GoOrwlT7DmZ3qdfD52E5NP5F6aO rTvFiz4hG/yDH2M+duXo15DfX0xLP59/zI+Cf4aH4C2HA3xMIRny9wlDMJl8R1d8BIyGJU eTtqz9sJaGj1nPoHHkHPfzbinqUMbfATchIeJbRt3LCLkY6Di9mrbud1c/zT7d8QN7/DWh k3cN71yEdRXfTmTx1Aha8LOSSq/jqzvg04lvGVuI4evRg1G8ZNJPcMMm0IKIQQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=none (mail01.ipfire.org: domain of smooky@v16.de has no SPF policy when checking 85.93.91.151) smtp.mailfrom=smooky@v16.de Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=none (mail01.ipfire.org: domain of smooky@v16.de has no SPF policy when checking 85.93.91.151) smtp.mailfrom=smooky@v16.de X-Rspamd-Queue-Id: 4BHlKD32XLzSD X-Spamd-Result: default: False [-2.01 / 11.00]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; IP_REPUTATION_HAM(-0.00)[asn: 8972(0.00), country: DE(-0.00), ip: 85.93.91.151(0.00)]; MIME_GOOD(-0.10)[text/plain]; ARC_SIGNED(0.00)[i=1]; DMARC_NA(0.00)[v16.de]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWO(0.00)[2]; FROM_NO_DN(0.00)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-0.91)[-0.912]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8972, ipnet:85.93.91.0/24, country:DE]; RCVD_COUNT_TWO(0.00)[2]; BAYES_HAM(-2.99)[99.95%]; RECEIVED_SPAMHAUS_PBL(0.00)[31.16.178.110:received] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series |
First Patch from me. Hope this Ok so. Socat, filan and procan.
|
|
Commit Message
smooky
July 30, 2020, 10:22 p.m. UTC
Signed-off-by: Marcel Follert (Smooky) <smooky@v16.de>
---
config/rootfiles/packages/socat | 4 ++
lfs/socat | 85 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
create mode 100644 config/rootfiles/packages/socat
create mode 100644 lfs/socat
Comments
Hello Marcel, Thank you for your patch. What is the use-case for this? Why do you need this packaged in IPFire? Best, -Michael > On 30 Jul 2020, at 23:22, smooky@v16.de wrote: > > Signed-off-by: Marcel Follert (Smooky) <smooky@v16.de> > --- > config/rootfiles/packages/socat | 4 ++ > lfs/socat | 85 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 89 insertions(+) > create mode 100644 config/rootfiles/packages/socat > create mode 100644 lfs/socat > > diff --git a/config/rootfiles/packages/socat b/config/rootfiles/packages/socat > new file mode 100644 > index 000000000..6a984e892 > --- /dev/null > +++ b/config/rootfiles/packages/socat > @@ -0,0 +1,4 @@ > +usr/bin/filan > +usr/bin/procan > +usr/bin/socat > +#usr/share/man/man1/socat.1 > diff --git a/lfs/socat b/lfs/socat > new file mode 100644 > index 000000000..6c3ffd5c1 > --- /dev/null > +++ b/lfs/socat > @@ -0,0 +1,85 @@ > +############################################################################### > +# # > +# IPFire.org - A linux based firewall # > +# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> # > +# # > +# 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 # > +# the Free Software Foundation, either version 3 of the License, or # > +# (at your option) any later version. # > +# # > +# This program is distributed in the hope that it will be useful, # > +# but WITHOUT ANY WARRANTY; without even the implied warranty of # > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # > +# GNU General Public License for more details. # > +# # > +# You should have received a copy of the GNU General Public License # > +# along with this program. If not, see <http://www.gnu.org/licenses/>. # > +# # > +############################################################################### > + > + > +############################################################################### > +# Definitions > +############################################################################### > + > +include Config > + > +VER = 1.7.3.4 > + > +THISAPP = socat-$(VER) > +DL_FILE = $(THISAPP).tar.gz > +DL_FROM = $(URL_IPFIRE) > +DIR_APP = $(DIR_SRC)/$(THISAPP) > +TARGET = $(DIR_INFO)/$(THISAPP) > +PROG = socat > +PAK_VER = 1 > + > +DEPS = > + > +############################################################################### > +# Top-level Rules > +############################################################################### > + > +objects = $(DL_FILE) > + > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) > + > +$(DL_FILE)_MD5 = c9e71d0136c88a01d6fd30a13a3936ed > + > +install : $(TARGET) > + > +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > + > +download :$(patsubst %,$(DIR_DL)/%,$(objects)) > + > +md5 : $(subst %,%_MD5,$(objects)) > + > +dist: > + @$(PAK) > + > +############################################################################### > +# Downloading, checking, md5sum > +############################################################################### > + > +$(patsubst %,$(DIR_CHK)/%,$(objects)) : > + @$(CHECK) > + > +$(patsubst %,$(DIR_DL)/%,$(objects)) : > + @$(LOAD) > + > +$(subst %,%_MD5,$(objects)) : > + @$(MD5) > + > +############################################################################### > +# Installation Details > +############################################################################### > + > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > + @$(PREBUILD) > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) > + cd $(DIR_APP) && ./configure --prefix=/usr > + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) > + cd $(DIR_APP) && make install > + @rm -rf $(DIR_APP) > + @$(POSTBUILD) > -- > 2.12.2 >
Hi Michael, I need this package for e.g. the script here > https://www.roessner-network-solutions.com/kvm-manage <. Furthermore, I saw in the IPFire forum that there was someone who would like to see it here > https://community.ipfire.org/t/missing-socat-command-in-ipfire/2584 <. I also made it available in the forum, which was then removed. It was explained to me that it is not welcome when unsigned packages are made available and that I should rather create a patch so that everyone gets something out of it and send it to the mailing list. After Peter Müller kindly explained to me with a lot of patience how it worked, I simply tried my luck. And tada, there is the patch. best regards Marcel Follert -----Ursprüngliche Nachricht----- Von: Michael Tremer <michael.tremer@ipfire.org> Gesendet: Montag, 3. August 2020 13:58 An: smooky@v16.de Cc: development@lists.ipfire.org Betreff: Re: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan. Hello Marcel, Thank you for your patch. What is the use-case for this? Why do you need this packaged in IPFire? Best, -Michael > On 30 Jul 2020, at 23:22, smooky@v16.de wrote: > > Signed-off-by: Marcel Follert (Smooky) <smooky@v16.de> > --- > config/rootfiles/packages/socat | 4 ++ > lfs/socat | 85 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 89 insertions(+) > create mode 100644 config/rootfiles/packages/socat > create mode 100644 lfs/socat > > diff --git a/config/rootfiles/packages/socat b/config/rootfiles/packages/socat > new file mode 100644 > index 000000000..6a984e892 > --- /dev/null > +++ b/config/rootfiles/packages/socat > @@ -0,0 +1,4 @@ > +usr/bin/filan > +usr/bin/procan > +usr/bin/socat > +#usr/share/man/man1/socat.1 > diff --git a/lfs/socat b/lfs/socat > new file mode 100644 > index 000000000..6c3ffd5c1 > --- /dev/null > +++ b/lfs/socat > @@ -0,0 +1,85 @@ > +########################################################################### #### > +# # > +# IPFire.org - A linux based firewall # > +# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> # > +# # > +# 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 # > +# the Free Software Foundation, either version 3 of the License, or # > +# (at your option) any later version. # > +# # > +# This program is distributed in the hope that it will be useful, # > +# but WITHOUT ANY WARRANTY; without even the implied warranty of # > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # > +# GNU General Public License for more details. # > +# # > +# You should have received a copy of the GNU General Public License # > +# along with this program. If not, see <http://www.gnu.org/licenses/>. # > +# # > +########################################################################### #### > + > + > +########################################################################### #### > +# Definitions > +########################################################################### #### > + > +include Config > + > +VER = 1.7.3.4 > + > +THISAPP = socat-$(VER) > +DL_FILE = $(THISAPP).tar.gz > +DL_FROM = $(URL_IPFIRE) > +DIR_APP = $(DIR_SRC)/$(THISAPP) > +TARGET = $(DIR_INFO)/$(THISAPP) > +PROG = socat > +PAK_VER = 1 > + > +DEPS = > + > +########################################################################### #### > +# Top-level Rules > +########################################################################### #### > + > +objects = $(DL_FILE) > + > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) > + > +$(DL_FILE)_MD5 = c9e71d0136c88a01d6fd30a13a3936ed > + > +install : $(TARGET) > + > +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > + > +download :$(patsubst %,$(DIR_DL)/%,$(objects)) > + > +md5 : $(subst %,%_MD5,$(objects)) > + > +dist: > + @$(PAK) > + > +########################################################################### #### > +# Downloading, checking, md5sum > +########################################################################### #### > + > +$(patsubst %,$(DIR_CHK)/%,$(objects)) : > + @$(CHECK) > + > +$(patsubst %,$(DIR_DL)/%,$(objects)) : > + @$(LOAD) > + > +$(subst %,%_MD5,$(objects)) : > + @$(MD5) > + > +########################################################################### #### > +# Installation Details > +########################################################################### #### > + > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > + @$(PREBUILD) > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) > + cd $(DIR_APP) && ./configure --prefix=/usr > + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) > + cd $(DIR_APP) && make install > + @rm -rf $(DIR_APP) > + @$(POSTBUILD) > -- > 2.12.2 >
Hello Marcel, > On 3 Aug 2020, at 15:05, smooky@v16.de wrote: > > Hi Michael, > > I need this package for e.g. the script here > > https://www.roessner-network-solutions.com/kvm-manage <. Furthermore, I saw > in the IPFire forum that there was someone who would like to see it here > > https://community.ipfire.org/t/missing-socat-command-in-ipfire/2584 <. I > also made it available in the forum, which was then removed. Yes, the problem that that brings is that you most likely only built it for one architecture when IPFire supports four. And people who download that package will never see any updates. Even if you upload them, they won’t “touch a running system”. > It was > explained to me that it is not welcome when unsigned packages are made > available and that I should rather create a patch so that everyone gets > something out of it and send it to the mailing list. Correct! > After Peter Müller > kindly explained to me with a lot of patience how it worked, I simply tried > my luck. And tada, there is the patch. Cool. This looks fine for me: Reviewed-by: Michael Tremer <michael.tremer@ipfire.org> Well done. I would ask you to pledge to post updates for this package whenever upstream releases something new. -Michael > > best regards > > Marcel Follert > > > -----Ursprüngliche Nachricht----- > Von: Michael Tremer <michael.tremer@ipfire.org> > Gesendet: Montag, 3. August 2020 13:58 > An: smooky@v16.de > Cc: development@lists.ipfire.org > Betreff: Re: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and > procan. > > Hello Marcel, > > Thank you for your patch. > > What is the use-case for this? Why do you need this packaged in IPFire? > > Best, > -Michael > >> On 30 Jul 2020, at 23:22, smooky@v16.de wrote: >> >> Signed-off-by: Marcel Follert (Smooky) <smooky@v16.de> >> --- >> config/rootfiles/packages/socat | 4 ++ >> lfs/socat | 85 > +++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 89 insertions(+) >> create mode 100644 config/rootfiles/packages/socat >> create mode 100644 lfs/socat >> >> diff --git a/config/rootfiles/packages/socat > b/config/rootfiles/packages/socat >> new file mode 100644 >> index 000000000..6a984e892 >> --- /dev/null >> +++ b/config/rootfiles/packages/socat >> @@ -0,0 +1,4 @@ >> +usr/bin/filan >> +usr/bin/procan >> +usr/bin/socat >> +#usr/share/man/man1/socat.1 >> diff --git a/lfs/socat b/lfs/socat >> new file mode 100644 >> index 000000000..6c3ffd5c1 >> --- /dev/null >> +++ b/lfs/socat >> @@ -0,0 +1,85 @@ >> > +########################################################################### > #### >> +# > # >> +# IPFire.org - A linux based firewall > # >> +# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> > # >> +# > # >> +# 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 > # >> +# the Free Software Foundation, either version 3 of the License, or > # >> +# (at your option) any later version. > # >> +# > # >> +# This program is distributed in the hope that it will be useful, > # >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of > # >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > # >> +# GNU General Public License for more details. > # >> +# > # >> +# You should have received a copy of the GNU General Public License > # >> +# along with this program. If not, see <http://www.gnu.org/licenses/>. > # >> +# > # >> > +########################################################################### > #### >> + >> + >> > +########################################################################### > #### >> +# Definitions >> > +########################################################################### > #### >> + >> +include Config >> + >> +VER = 1.7.3.4 >> + >> +THISAPP = socat-$(VER) >> +DL_FILE = $(THISAPP).tar.gz >> +DL_FROM = $(URL_IPFIRE) >> +DIR_APP = $(DIR_SRC)/$(THISAPP) >> +TARGET = $(DIR_INFO)/$(THISAPP) >> +PROG = socat >> +PAK_VER = 1 >> + >> +DEPS = >> + >> > +########################################################################### > #### >> +# Top-level Rules >> > +########################################################################### > #### >> + >> +objects = $(DL_FILE) >> + >> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> + >> +$(DL_FILE)_MD5 = c9e71d0136c88a01d6fd30a13a3936ed >> + >> +install : $(TARGET) >> + >> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> + >> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> + >> +md5 : $(subst %,%_MD5,$(objects)) >> + >> +dist: >> + @$(PAK) >> + >> > +########################################################################### > #### >> +# Downloading, checking, md5sum >> > +########################################################################### > #### >> + >> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >> + @$(CHECK) >> + >> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >> + @$(LOAD) >> + >> +$(subst %,%_MD5,$(objects)) : >> + @$(MD5) >> + >> > +########################################################################### > #### >> +# Installation Details >> > +########################################################################### > #### >> + >> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> + @$(PREBUILD) >> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) >> + cd $(DIR_APP) && ./configure --prefix=/usr >> + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) >> + cd $(DIR_APP) && make install >> + @rm -rf $(DIR_APP) >> + @$(POSTBUILD) >> -- >> 2.12.2 >> > > >
Hi Michael, > I would ask you to pledge to post updates for this package whenever upstream releases something new. Of course, I like to do it best regards Marcel Follert -----Ursprüngliche Nachricht----- Von: Michael Tremer <michael.tremer@ipfire.org> Gesendet: Dienstag, 4. August 2020 11:34 An: smooky@v16.de Cc: development@lists.ipfire.org Betreff: Re: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan. Hello Marcel, > On 3 Aug 2020, at 15:05, smooky@v16.de wrote: > > Hi Michael, > > I need this package for e.g. the script here > > https://www.roessner-network-solutions.com/kvm-manage <. Furthermore, > I saw in the IPFire forum that there was someone who would like to see > it here > > https://community.ipfire.org/t/missing-socat-command-in-ipfire/2584 <. > I also made it available in the forum, which was then removed. Yes, the problem that that brings is that you most likely only built it for one architecture when IPFire supports four. And people who download that package will never see any updates. Even if you upload them, they won’t “touch a running system”. > It was > explained to me that it is not welcome when unsigned packages are made > available and that I should rather create a patch so that everyone > gets something out of it and send it to the mailing list. Correct! > After Peter Müller > kindly explained to me with a lot of patience how it worked, I simply > tried my luck. And tada, there is the patch. Cool. This looks fine for me: Reviewed-by: Michael Tremer <michael.tremer@ipfire.org> Well done. I would ask you to pledge to post updates for this package whenever upstream releases something new. -Michael > > best regards > > Marcel Follert > > > -----Ursprüngliche Nachricht----- > Von: Michael Tremer <michael.tremer@ipfire.org> > Gesendet: Montag, 3. August 2020 13:58 > An: smooky@v16.de > Cc: development@lists.ipfire.org > Betreff: Re: [PATCH] First Patch from me. Hope this Ok so. Socat, > filan and procan. > > Hello Marcel, > > Thank you for your patch. > > What is the use-case for this? Why do you need this packaged in IPFire? > > Best, > -Michael > >> On 30 Jul 2020, at 23:22, smooky@v16.de wrote: >> >> Signed-off-by: Marcel Follert (Smooky) <smooky@v16.de> >> --- >> config/rootfiles/packages/socat | 4 ++ >> lfs/socat | 85 > +++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 89 insertions(+) >> create mode 100644 config/rootfiles/packages/socat create mode 100644 >> lfs/socat >> >> diff --git a/config/rootfiles/packages/socat > b/config/rootfiles/packages/socat >> new file mode 100644 >> index 000000000..6a984e892 >> --- /dev/null >> +++ b/config/rootfiles/packages/socat >> @@ -0,0 +1,4 @@ >> +usr/bin/filan >> +usr/bin/procan >> +usr/bin/socat >> +#usr/share/man/man1/socat.1 >> diff --git a/lfs/socat b/lfs/socat >> new file mode 100644 >> index 000000000..6c3ffd5c1 >> --- /dev/null >> +++ b/lfs/socat >> @@ -0,0 +1,85 @@ >> > +##################################################################### > +###### > #### >> +# > # >> +# IPFire.org - A linux based firewall > # >> +# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> > # >> +# > # >> +# 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 > # >> +# the Free Software Foundation, either version 3 of the License, or > # >> +# (at your option) any later version. > # >> +# > # >> +# This program is distributed in the hope that it will be useful, > # >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of > # >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > # >> +# GNU General Public License for more details. > # >> +# > # >> +# You should have received a copy of the GNU General Public License > # >> +# along with this program. If not, see <http://www.gnu.org/licenses/>. > # >> +# > # >> > +##################################################################### > +###### > #### >> + >> + >> > +##################################################################### > +###### > #### >> +# Definitions >> > +##################################################################### > +###### > #### >> + >> +include Config >> + >> +VER = 1.7.3.4 >> + >> +THISAPP = socat-$(VER) >> +DL_FILE = $(THISAPP).tar.gz >> +DL_FROM = $(URL_IPFIRE) >> +DIR_APP = $(DIR_SRC)/$(THISAPP) >> +TARGET = $(DIR_INFO)/$(THISAPP) >> +PROG = socat >> +PAK_VER = 1 >> + >> +DEPS = >> + >> > +##################################################################### > +###### > #### >> +# Top-level Rules >> > +##################################################################### > +###### > #### >> + >> +objects = $(DL_FILE) >> + >> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> + >> +$(DL_FILE)_MD5 = c9e71d0136c88a01d6fd30a13a3936ed >> + >> +install : $(TARGET) >> + >> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> + >> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> + >> +md5 : $(subst %,%_MD5,$(objects)) >> + >> +dist: >> + @$(PAK) >> + >> > +##################################################################### > +###### > #### >> +# Downloading, checking, md5sum >> > +##################################################################### > +###### > #### >> + >> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >> + @$(CHECK) >> + >> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >> + @$(LOAD) >> + >> +$(subst %,%_MD5,$(objects)) : >> + @$(MD5) >> + >> > +##################################################################### > +###### > #### >> +# Installation Details >> > +##################################################################### > +###### > #### >> + >> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> + @$(PREBUILD) >> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) >> + cd $(DIR_APP) && ./configure --prefix=/usr >> + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) >> + cd $(DIR_APP) && make install >> + @rm -rf $(DIR_APP) >> + @$(POSTBUILD) >> -- >> 2.12.2 >> > > >
diff --git a/config/rootfiles/packages/socat b/config/rootfiles/packages/socat new file mode 100644 index 000000000..6a984e892 --- /dev/null +++ b/config/rootfiles/packages/socat @@ -0,0 +1,4 @@ +usr/bin/filan +usr/bin/procan +usr/bin/socat +#usr/share/man/man1/socat.1 diff --git a/lfs/socat b/lfs/socat new file mode 100644 index 000000000..6c3ffd5c1 --- /dev/null +++ b/lfs/socat @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.7.3.4 + +THISAPP = socat-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = socat +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c9e71d0136c88a01d6fd30a13a3936ed + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD)