AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[smooky]

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]

Hey all.

Does anyone happen to have an idea why the socat package offered by Pakfire
does not contain any program data? 
It only contains the install.sh, uninstall.sh, update.sh, ROOTFILES and an
empty .tar.xz archive. 
Seen here
https://mirror1.ipfire.org/pakfire2/2.25-x86_64/paks/socat-1.7.3.4-1.ipfire.
The .tar.xz archive is filled with my locally created version.

best regards

Marcel Follert

Re: AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

Hi,

something like

...
  lfsmake2 socat
...

is missing in 'make.sh'.

'socat' wasn't built.

HTH,
Matthias

On 04.11.2020 21:35, smooky(a)v16.de wrote:
> Hey all.
> 
> Does anyone happen to have an idea why the socat package offered by Pakfire
> does not contain any program data? 
> It only contains the install.sh, uninstall.sh, update.sh, ROOTFILES and an
> empty .tar.xz archive. 
> Seen here
> https://mirror1.ipfire.org/pakfire2/2.25-x86_64/paks/socat-1.7.3.4-1.ipfire.
> The .tar.xz archive is filled with my locally created version.
> 
> best regards
> 
> Marcel Follert
> 
> 

Re: AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

Addition:

See also in '_build.packages.log':

...
Nov  3 12:11:21: Building socat socat-1.7.3.4.tar.gz checksum OK
+ cd /usr/src/lfs
+ make -f socat LFS_BASEDIR=/usr/src dist
'/usr/src/config/rootfiles/packages//socat' ->
'/tmp/package-socat/ROOTFILES'
tar: usr/bin/filan: Cannot stat: No such file or directory
tar: usr/bin/procan: Cannot stat: No such file or directory
tar: usr/bin/socat: Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors
tar: *: Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors
...

On 04.11.2020 21:35, smooky(a)v16.de wrote:
> Hey all.
> 
> Does anyone happen to have an idea why the socat package offered by Pakfire
> does not contain any program data? 
> It only contains the install.sh, uninstall.sh, update.sh, ROOTFILES and an
> empty .tar.xz archive. 
> Seen here
> https://mirror1.ipfire.org/pakfire2/2.25-x86_64/paks/socat-1.7.3.4-1.ipfire.
> The .tar.xz archive is filled with my locally created version.
> 
> best regards
> 
> Marcel Follert
> 
> 

AW: AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[smooky]

[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]

Hi Matthias.

Does that mean I should have included the customized make.sh with the patch?
I didn't do that with lshw and ncdu either, but everything seems to work.

best regards

Marcel Follert

-----Ursprüngliche Nachricht-----
Von: Matthias Fischer <matthias.fischer(a)ipfire.org> 
Gesendet: Mittwoch, 4. November 2020 22:17
An: smooky(a)v16.de; development(a)lists.ipfire.org
Betreff: Re: AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

Hi,

something like

...
  lfsmake2 socat
...

is missing in 'make.sh'.

'socat' wasn't built.

HTH,
Matthias

On 04.11.2020 21:35, smooky(a)v16.de wrote:
> Hey all.
> 
> Does anyone happen to have an idea why the socat package offered by 
> Pakfire does not contain any program data?
> It only contains the install.sh, uninstall.sh, update.sh, ROOTFILES 
> and an empty .tar.xz archive.
> Seen here
> https://mirror1.ipfire.org/pakfire2/2.25-x86_64/paks/socat-1.7.3.4-1.ipfire.
> The .tar.xz archive is filled with my locally created version.
> 
> best regards
> 
> Marcel Follert
> 
> 

Re: AW: AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1886 bytes --]

On 04.11.2020 23:04, smooky(a)v16.de wrote:
> Hi Matthias.

Hi,

> Does that mean I should have included the customized make.sh with the patch?

Exactly. ;-)

> I didn't do that with lshw and ncdu either, but everything seems to work.

Both exist in 'make.sh' - no need to add. They were both added by MT
(2020-09-21).

=>
https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=make.sh;h=9ddfd4c07bcf6f1f0ec01097b971afa5d8bd7a02;hb=refs/heads/master#l1649

Added by MT:
=>
https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;f=make.sh;h=4d275bcd1f86383a82625a674ef05bc8738d889b

...and:
=>
https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;f=make.sh;h=76c5f3e0d96525c419faa3e69d7592d3e3d0965b

If you add a *new* package to the distribution, an appropriate lfsmake2
... -line must be added to 'make.sh' or nothing will be compiled.

Best,
Matthas

> best regards
> 
> Marcel Follert
> 
> -----Ursprüngliche Nachricht-----
> Von: Matthias Fischer <matthias.fischer(a)ipfire.org> 
> Gesendet: Mittwoch, 4. November 2020 22:17
> An: smooky(a)v16.de; development(a)lists.ipfire.org
> Betreff: Re: AW: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.
> 
> Hi,
> 
> something like
> 
> ...
>   lfsmake2 socat
> ...
> 
> is missing in 'make.sh'.
> 
> 'socat' wasn't built.
> 
> HTH,
> Matthias
> 
> On 04.11.2020 21:35, smooky(a)v16.de wrote:
>> Hey all.
>> 
>> Does anyone happen to have an idea why the socat package offered by 
>> Pakfire does not contain any program data?
>> It only contains the install.sh, uninstall.sh, update.sh, ROOTFILES 
>> and an empty .tar.xz archive.
>> Seen here
>> https://mirror1.ipfire.org/pakfire2/2.25-x86_64/paks/socat-1.7.3.4-1.ipfire.
>> The .tar.xz archive is filled with my locally created version.
>> 
>> best regards
>> 
>> Marcel Follert
>> 
>> 
> 
> 
> 

Re: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]

Very interesting.

The build should actually abort if this happens.

Could someone please investigate why this isn’t happening?

In the meantime, I will merge the patch by Marcel to add the package to the build process. Sorry, I must have overlooked that before.

-Michael

> On 4 Nov 2020, at 21:19, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
> 
> Addition:
> 
> See also in '_build.packages.log':
> 
> ...
> Nov  3 12:11:21: Building socat socat-1.7.3.4.tar.gz checksum OK
> + cd /usr/src/lfs
> + make -f socat LFS_BASEDIR=/usr/src dist
> '/usr/src/config/rootfiles/packages//socat' ->
> '/tmp/package-socat/ROOTFILES'
> tar: usr/bin/filan: Cannot stat: No such file or directory
> tar: usr/bin/procan: Cannot stat: No such file or directory
> tar: usr/bin/socat: Cannot stat: No such file or directory
> tar: Exiting with failure status due to previous errors
> tar: *: Cannot stat: No such file or directory
> tar: Exiting with failure status due to previous errors
> ...
> 
> On 04.11.2020 21:35, smooky(a)v16.de wrote:
>> Hey all.
>> 
>> Does anyone happen to have an idea why the socat package offered by Pakfire
>> does not contain any program data? 
>> It only contains the install.sh, uninstall.sh, update.sh, ROOTFILES and an
>> empty .tar.xz archive. 
>> Seen here
>> https://mirror1.ipfire.org/pakfire2/2.25-x86_64/paks/socat-1.7.3.4-1.ipfire.
>> The .tar.xz archive is filled with my locally created version.
>> 
>> best regards
>> 
>> Marcel Follert
>> 
>> 
> 

Re: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5858 bytes --]

Hello Marcel,

> On 3 Aug 2020, at 15:05, smooky(a)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(a)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(a)ipfire.org> 
> Gesendet: Montag, 3. August 2020 13:58
> An: smooky(a)v16.de
> Cc: development(a)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(a)v16.de wrote:
>> 
>> Signed-off-by: Marcel Follert (Smooky) <smooky(a)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(a)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
>> 
> 
> 
> 

Re: [PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4530 bytes --]

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(a)v16.de wrote:
> 
> Signed-off-by: Marcel Follert (Smooky) <smooky(a)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(a)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
> 

[PATCH] First Patch from me. Hope this Ok so. Socat, filan and procan.

[smooky]

[-- Attachment #1: Type: text/plain, Size: 4113 bytes --]

Signed-off-by: Marcel Follert (Smooky) <smooky(a)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(a)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