From e0a59f58c51c1cd1fde2b35b5a30397dea0264b0 Mon Sep 17 00:00:00 2001
From: Daniel Steiner <daniel.steiner@dsteiner.ch>
Date: Wed, 13 Dec 2023 11:04:41 +0100
Subject: [PATCH] SSHpiper is now build during rpmbuild, updates for gitea and
 sshpiper

---
 fedora/SPECS/gitea.spec    |  5 ++++-
 fedora/SPECS/sshpiper.spec | 31 +++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec
index 0fd5321..5af6a8f 100644
--- a/fedora/SPECS/gitea.spec
+++ b/fedora/SPECS/gitea.spec
@@ -1,5 +1,5 @@
 Name:           gitea
-Version:        1.21.1
+Version:        1.21.2
 Release:        1%{?dist}
 Summary:        Gitea is a painless self-hosted Git service.
 %define	MyVersion %version
@@ -84,6 +84,9 @@ getent passwd gitea > /dev/null || \
 
 
 %changelog
+* Wed Dec 13 2023 Daniel Steiner <daniel.steiner@dsteiner.ch>
+- Update to 1.21.2.
+
 * Tue Nov 28 2023 Daniel Steiner <daniel.steiner@dsteiner.ch>
 - Update to 1.21.1.
 
diff --git a/fedora/SPECS/sshpiper.spec b/fedora/SPECS/sshpiper.spec
index e1aff51..97ca88b 100644
--- a/fedora/SPECS/sshpiper.spec
+++ b/fedora/SPECS/sshpiper.spec
@@ -1,23 +1,38 @@
 Name:           sshpiper
-Version:        1.2.3
-Release:        3git%{?dist}
+Version:        1.2.4
+Release:        1git%{?dist}
 Summary:        Reverse proxy for sshd.
 %define debug_package %{nil}
 %define _build_id_links none 
 
 License:        MIT
-URL:            https://gitea.io
-Source0:        %{name}-%{version}.tar.gz
+URL:            https://github.com/tg123/sshpiper
+Source0:        %{name}.tar.gz
+# Source0:        %{name}-%{version}.tar.gz
 Source1:	      sshpiperd.service
 Source2:        sshpiper
 Source3:        sshpiper-tempfile
 
+%define debug_package %{nil}
+%define _build_id_links none
+
+# %global name sshpiper
+%global __mangle_shebangs_exclude_from /usr/bin/env
+
 %description
 Go package for sshpiper is the reverse proxy for sshd. all protocols, 
 including ssh, scp, port forwarding, running on top of ssh are supported.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -n %{name}
+cd ..
+rm -rf %{name}
+git clone https://github.com/tg123/sshpiper
+cd %{name}
+git submodule update --init --recursive
+
+%build
+mkdir out; go build -tags full -o out ./...
 
 # to build:
 # Note: It does not build from tarball!
@@ -33,14 +48,18 @@ including ssh, scp, port forwarding, running on top of ssh are supported.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd out
 install -D %{name}d $RPM_BUILD_ROOT/%{_bindir}/%{name}d
 install -D %{S:1} $RPM_BUILD_ROOT/%{_unitdir}/%{name}d.service
 install -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}
 install -D %{S:3} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/%{name}
 mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/%{name}
-pushd plugins
 for f in *; do
+if [ "$f" == "%{name}d" ]; then
+:
+else
 install -D $f $RPM_BUILD_ROOT/%{_datarootdir}/%{name}/plugins/$f
+fi
 done
 popd