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

Message ID 20200730222211.32082-1-smooky@v16.de
State New
Headers show
Series
  • First Patch from me. Hope this Ok so. Socat, filan and procan.
Related show

Commit Message

smooky@v16.de 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

Michael Tremer Aug. 3, 2020, 11:57 a.m. UTC | #1
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
>
smooky@v16.de Aug. 3, 2020, 2:05 p.m. UTC | #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
>
Michael Tremer Aug. 4, 2020, 9:34 a.m. UTC | #3
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
>> 
> 
> 
>
smooky@v16.de Aug. 4, 2020, 1:55 p.m. UTC | #4
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
>> 
> 
> 
>

Patch

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)