From fa7b6cd5a14f7cfbaae46908c7b5de83639b00b6 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 7 Mar 2016 10:52:18 +0000 Subject: [PATCH 01/33] * Sun Mar 06 2016 Paul Wouters - 0.4-1 - Updated to 0.4 - Resolves: rhbz#1213128 wrong user tcpcrypt - Resolves: rhbz#1312703 Package systemd ExecStartPre/ExecStopPost script broken --- sources | 2 +- tcpcrypt.spec | 36 +++++++++++++++++++++++------------- tcpcryptd-firewall | 16 ++++++++++++++++ 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/sources b/sources index d753f8c..b4cefa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a664a62b58c891eb0b769234bab34a9b tcpcrypt-bb990b1bfb0e411f0613abdaf3b71fdce50a82cf.tar.gz +b2d9f68a680ea4f4cd86c81fb6a813c0 tcpcrypt-0.4.tar.gz diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 891ee31..4efff5e 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -1,31 +1,32 @@ %global _hardened_build 1 - -%global commit bb990b1bfb0e411f0613abdaf3b71fdce50a82cf -%global shortcommit %(c=%{commit}; echo ${c:0:8}) - -# Requested upstream to do proper release so we dont need auto* tools -# and we dont have github tar ball diffs -# Reported old macro use AC_PROG_LIBTOOL https://github.com/scslab/tcpcrypt/pull/3 +%global snapshot 0 Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 0.5.%{shortcommit}%{?dist} +Release: 1%{?dist} Group: System Environment/Libraries License: BSD Url: http://tcpcrypt.org/ -Source0: https://github.com/scslab/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz SOURCE1: tmpfiles-tcpcrypt.conf SOURCE2: tcpcryptd.service SOURCE3: tcpcryptd-firewall +SOURCE4: tcpcrypt-firewalld.xml Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: openssl-devel libnetfilter_queue-devel libcap-devel -BuildRequires: libtool, autoconf, automake +BuildRequires: libnetfilter_conntrack-devel libpcap-devel +%if %{snapshot} +BuildRequires: libtool autoconf automake +%endif + BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires(pre): shadow-utils +# we need to require it to install our file +Requires: firewalld %description Provides a protocol that attempts to encrypt (almost) all of your @@ -52,11 +53,12 @@ Requires(postun): /sbin/ldconfig Contains libraries used by tcpcryptd server and tcpcrypt-aware applications %prep -%setup -qn %{name}-%{commit} +%setup -q %build -# git snapsots only +%if %{snapshot} ./bootstrap.sh +%endif %configure --disable-static --disable-rpath make %{?_smp_mflags} @@ -68,6 +70,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/ %{buildroot}/run/tcpcryptd install -D -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/tcpcrypt.conf mkdir -p %{buildroot}%{_unitdir} install -m 0755 %{SOURCE2} %{buildroot}/%{_unitdir}/tcpcryptd.service +# install firewalld policy needed for tracking and marking packets +install -D -m 0644 %{SOURCE4} %{buildroot}/%{_prefix}/lib/firewalld/services/tcpcryptd.xml %files libs %doc README.markdown LICENSE @@ -82,6 +86,7 @@ install -m 0755 %{SOURCE2} %{buildroot}/%{_unitdir}/tcpcryptd.service %{_mandir}/man8/* %attr(0644,root,root) %{_tmpfilesdir}/tcpcrypt.conf %attr(0644,root,root) %{_unitdir}/tcpcryptd.service +%attr(0644,root,root) %{_prefix}/lib/firewalld/services/tcpcryptd.xml %attr(0755,tcpcryptd,tcpcryptd) %dir /run/tcpcryptd %files devel @@ -96,7 +101,7 @@ install -m 0755 %{SOURCE2} %{buildroot}/%{_unitdir}/tcpcryptd.service getent group tcpcryptd >/dev/null || groupadd -r tcpcryptd getent passwd tcpcryptd >/dev/null || \ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ --c "tcpcrypt daemon account" tcpcrypt || exit 0 +-c "tcpcrypt daemon account" tcpcryptd || exit 0 %post %systemd_post tcpcryptd.service @@ -108,6 +113,11 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sun Mar 06 2016 Paul Wouters - 0.4-1 +- Updated to 0.4 +- Resolves: rhbz#1213128 wrong user tcpcrypt +- Resolves: rhbz#1312703 Package systemd ExecStartPre/ExecStopPost script broken + * Fri Feb 05 2016 Fedora Release Engineering - 0.4-0.5.bb990b1b - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/tcpcryptd-firewall b/tcpcryptd-firewall index 01f64f5..e598db8 100755 --- a/tcpcryptd-firewall +++ b/tcpcryptd-firewall @@ -1,5 +1,19 @@ #!/bin/sh +# Check if we need to use firewalld or will handle rules directly with iptables + + +systemctl status firewalld.service >/dev/null +RETVAL=$? +if [ $RETVAL -eq 0 ] +then + # use firewalld + firewall-cmd --reload + firewall-cmd --direct --get-rules ipv4 raw tcpcrypt + firewall-cmd --direct --get-rules ipv4 mangle tcpcrypt +else + # use iptables manually + if [ "$1" == "start" ] then iptables -t raw -N tcpcrypt @@ -20,3 +34,5 @@ then iptables -t mangle -F tcpcrypt iptables -t mangle -D PREROUTING -j tcpcrypt fi + +fi From 8ee9cd018748bf20b6f5d356cb6cf2988baf9c05 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 7 Mar 2016 11:04:47 +0000 Subject: [PATCH 02/33] added new tcpcrypt-firewalld.xml --- tcpcrypt-firewalld.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tcpcrypt-firewalld.xml diff --git a/tcpcrypt-firewalld.xml b/tcpcrypt-firewalld.xml new file mode 100644 index 0000000..01ecbd0 --- /dev/null +++ b/tcpcrypt-firewalld.xml @@ -0,0 +1,12 @@ + + + + + -p tcp -m mark --mark 0x0/0x10 -j NFQUEUE --queue-num 666 + -j tcpcrypt + + + + -p tcp -m mark --mark 0x0/0x10 -j NFQUEUE --queue-num 666 + -j tcpcrypt + From 0cc89da61738f755e4ca124cf2edb96cd7c1df1b Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 7 Mar 2016 11:21:29 +0000 Subject: [PATCH 03/33] updated .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 96f7b2b..cf4f630 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tcpcrypt-bb990b1bfb0e411f0613abdaf3b71fdce50a82cf.tar.gz +/tcpcrypt-0.4.tar.gz From 46ca029d132a5a9f23ffc5e8b370e952e584bb88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 15:39:55 +0000 Subject: [PATCH 04/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 4efff5e..d490864 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: BSD Url: http://tcpcrypt.org/ @@ -113,6 +113,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Mar 06 2016 Paul Wouters - 0.4-1 - Updated to 0.4 - Resolves: rhbz#1213128 wrong user tcpcrypt From 27c9e75e523368f71e2720ead46f4681d8067c3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:02:26 +0000 Subject: [PATCH 05/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index d490864..40b95b9 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: BSD Url: http://tcpcrypt.org/ @@ -113,6 +113,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From d393c76ddfbaf092205818c8dc6712e698530137 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:13:00 +0000 Subject: [PATCH 06/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 40b95b9..614029e 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Libraries License: BSD Url: http://tcpcrypt.org/ @@ -113,6 +113,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4fb279bc78dd56ee532bfdced9ed78c1b7ee1e13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 18:36:35 +0000 Subject: [PATCH 07/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 614029e..fd1acf1 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 4%{?dist} +Release: 5%{?dist} Group: System Environment/Libraries License: BSD Url: http://tcpcrypt.org/ @@ -113,6 +113,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 816b02bcf85d31061dfc847194c6864e5fb70369 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:52 +0200 Subject: [PATCH 08/33] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- tcpcrypt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index fd1acf1..6f6e39e 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -14,6 +14,7 @@ SOURCE2: tcpcryptd.service SOURCE3: tcpcryptd-firewall SOURCE4: tcpcrypt-firewalld.xml Requires: %{name}-libs%{?_isa} = %{version}-%{release} +BuildRequires: gcc BuildRequires: openssl-devel libnetfilter_queue-devel libcap-devel BuildRequires: libnetfilter_conntrack-devel libpcap-devel %if %{snapshot} From b43d7554a209de36ee99cec6d3493c41f80476e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:21:16 +0000 Subject: [PATCH 09/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 6f6e39e..1be988e 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 5%{?dist} +Release: 6%{?dist} Group: System Environment/Libraries License: BSD Url: http://tcpcrypt.org/ @@ -114,6 +114,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From df3d569846465c6d30d287c1971bfc3fd91122d1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:08 +0100 Subject: [PATCH 10/33] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- tcpcrypt.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 1be988e..3e70391 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -47,8 +47,6 @@ The devel package contains the tcpcrypt library and the include files %package libs Summary: Libraries used by tcpcryptd server and tcpcrypt-aware applications Group: Applications/System -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %description libs Contains libraries used by tcpcryptd server and tcpcrypt-aware applications @@ -95,8 +93,7 @@ install -D -m 0644 %{SOURCE4} %{buildroot}/%{_prefix}/lib/firewalld/services/tcp %dir %{_includedir}/tcpcrypt %{_includedir}/tcpcrypt/*.h -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %pre getent group tcpcryptd >/dev/null || groupadd -r tcpcryptd From 4a8fded4a43bd58a67ec974f4060f08a347c981a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:27 +0100 Subject: [PATCH 11/33] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- tcpcrypt.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 3e70391..352ca40 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -5,7 +5,6 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 Release: 6%{?dist} -Group: System Environment/Libraries License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -38,7 +37,6 @@ end does not support %package devel Summary: Development package that includes the tcpcrypt header files -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -46,7 +44,6 @@ The devel package contains the tcpcrypt library and the include files %package libs Summary: Libraries used by tcpcryptd server and tcpcrypt-aware applications -Group: Applications/System %description libs Contains libraries used by tcpcryptd server and tcpcrypt-aware applications From 632677a3a958820b10ecd1d967192a0d5c66eb6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 09:31:04 +0000 Subject: [PATCH 12/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 352ca40..3d63de3 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -108,6 +108,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 49045f60eeac3acacbb10dfd5ad3185d8b61f8e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 01:06:16 +0000 Subject: [PATCH 13/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 3d63de3..6e5d01b 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -108,6 +108,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c47f9697d7bcf2b89b0f8e1f3079ffefc5bd15be Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sun, 4 Aug 2019 13:39:23 -0300 Subject: [PATCH 14/33] - Update to 0.5 plus spec cleanup and modernization --- .gitignore | 1 + sources | 2 +- tcpcrypt.spec | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index cf4f630..6ca1317 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /tcpcrypt-bb990b1bfb0e411f0613abdaf3b71fdce50a82cf.tar.gz /tcpcrypt-0.4.tar.gz +/tcpcrypt-0.5.tar.gz diff --git a/sources b/sources index b4cefa3..6a603fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b2d9f68a680ea4f4cd86c81fb6a813c0 tcpcrypt-0.4.tar.gz +SHA512 (tcpcrypt-0.5.tar.gz) = aa7068e24c16449e84cc06450bbbac0a245df4f7883eef3c5cc10afb3592f194d42103d06e3e072ad997d09835545fa71bfecd57209ee45c07433f64fb6f0048 diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 6e5d01b..1ba68f0 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -3,8 +3,8 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt -Version: 0.4 -Release: 8%{?dist} +Version: 0.5 +Release: 1%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -16,10 +16,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: gcc BuildRequires: openssl-devel libnetfilter_queue-devel libcap-devel BuildRequires: libnetfilter_conntrack-devel libpcap-devel -%if %{snapshot} BuildRequires: libtool autoconf automake -%endif - BuildRequires: systemd Requires(post): systemd Requires(preun): systemd @@ -49,17 +46,15 @@ Summary: Libraries used by tcpcryptd server and tcpcrypt-aware applications Contains libraries used by tcpcryptd server and tcpcrypt-aware applications %prep -%setup -q +%autosetup %build -%if %{snapshot} -./bootstrap.sh -%endif +sh bootstrap.sh %configure --disable-static --disable-rpath -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install +%make_install install -m 0755 %{SOURCE3} %{buildroot}/%{_bindir} rm %{buildroot}%{_libdir}/*.la mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/ %{buildroot}/run/tcpcryptd @@ -70,11 +65,13 @@ install -m 0755 %{SOURCE2} %{buildroot}/%{_unitdir}/tcpcryptd.service install -D -m 0644 %{SOURCE4} %{buildroot}/%{_prefix}/lib/firewalld/services/tcpcryptd.xml %files libs -%doc README.markdown LICENSE +%doc README.markdown +%license LICENSE %{_libdir}/libtcpcrypt.so.* %files -%doc README.markdown LICENSE +%doc README.markdown +%license LICENSE %{_bindir}/tcnetstat %{_bindir}/tcpcryptd %{_bindir}/tcpcryptd-firewall @@ -108,6 +105,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sun Aug 04 2019 Filipe Rosset - 0.5-1 +- Update to 0.5 plus spec cleanup and modernization + * Sat Jul 27 2019 Fedora Release Engineering - 0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2438ab04726e5f42f978fb53878e62c7553739db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 01:12:33 +0000 Subject: [PATCH 15/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 1ba68f0..e86bcfd 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -105,6 +105,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Aug 04 2019 Filipe Rosset - 0.5-1 - Update to 0.5 plus spec cleanup and modernization From 5a7e08d175d5851eb257ef39e07c56f100698ed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 12:11:35 +0000 Subject: [PATCH 16/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index e86bcfd..ef57967 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -105,6 +105,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4e781e4087b0067251faaf64350416d8b69bca48 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 22:21:27 +0000 Subject: [PATCH 17/33] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- tcpcrypt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index ef57967..a281356 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -13,6 +13,7 @@ SOURCE2: tcpcryptd.service SOURCE3: tcpcryptd-firewall SOURCE4: tcpcrypt-firewalld.xml Requires: %{name}-libs%{?_isa} = %{version}-%{release} +BuildRequires: make BuildRequires: gcc BuildRequires: openssl-devel libnetfilter_queue-devel libcap-devel BuildRequires: libnetfilter_conntrack-devel libpcap-devel From d19cf2894f8a29458887b20157f1153c9f522f2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:41:26 +0000 Subject: [PATCH 18/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index a281356..4c21113 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -106,6 +106,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ba99af065afba6bd7b3b7c39d3d209d8f23dc487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:10 +0100 Subject: [PATCH 19/33] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- tcpcrypt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 4c21113..a737b70 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -106,6 +106,10 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.5-5 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dc900f83b9e0f200bca85f10c53ce18b6ee17abc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:58:40 +0000 Subject: [PATCH 20/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index a737b70..16ee275 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -106,6 +106,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.5-5 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 938e15f82e848b4c00075768528b801eaa963d28 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:16:19 +0200 Subject: [PATCH 21/33] Rebuilt with OpenSSL 3.0.0 --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 16ee275..a5015e4 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -106,6 +106,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Tue Sep 14 2021 Sahana Prasad - 0.5-7 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 0.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9c5e9251fda98204f11fb5bd440cdc36cd96b5cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 02:24:26 +0000 Subject: [PATCH 22/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index a5015e4..62b06f3 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 7%{?dist} +Release: 8%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -106,6 +106,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 0.5-7 - Rebuilt with OpenSSL 3.0.0 From 2b16cc5e612d04465a5d3c45dca742d535b7f786 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:11:27 +0000 Subject: [PATCH 23/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 62b06f3..c2520f5 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -106,6 +106,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0005726b5e155a034f9deb8816a9978d0bfcd050 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:45:30 +0000 Subject: [PATCH 24/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index c2520f5..74d9ff8 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -106,6 +106,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b363879202b4d608eca2f7e822de9011a2d5f66b Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Thu, 23 Feb 2023 09:31:10 -0500 Subject: [PATCH 25/33] fix: remove broken firewalld integration The "direct" XML element has never been valid inside of a service definition. So the firewalld integration has never worked. New firewalld enforces sane configuration at startup. Old firewalld would ignore the broken service definition and load the rest of the configuration. --- tcpcrypt-firewalld.xml | 12 ------------ tcpcrypt.spec | 11 ++++------- tcpcryptd-firewall | 17 +---------------- 3 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 tcpcrypt-firewalld.xml diff --git a/tcpcrypt-firewalld.xml b/tcpcrypt-firewalld.xml deleted file mode 100644 index 01ecbd0..0000000 --- a/tcpcrypt-firewalld.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - -p tcp -m mark --mark 0x0/0x10 -j NFQUEUE --queue-num 666 - -j tcpcrypt - - - - -p tcp -m mark --mark 0x0/0x10 -j NFQUEUE --queue-num 666 - -j tcpcrypt - diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 74d9ff8..a2aab3a 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,14 +4,13 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz SOURCE1: tmpfiles-tcpcrypt.conf SOURCE2: tcpcryptd.service SOURCE3: tcpcryptd-firewall -SOURCE4: tcpcrypt-firewalld.xml Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: make BuildRequires: gcc @@ -23,8 +22,6 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires(pre): shadow-utils -# we need to require it to install our file -Requires: firewalld %description Provides a protocol that attempts to encrypt (almost) all of your @@ -62,8 +59,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/ %{buildroot}/run/tcpcryptd install -D -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/tcpcrypt.conf mkdir -p %{buildroot}%{_unitdir} install -m 0755 %{SOURCE2} %{buildroot}/%{_unitdir}/tcpcryptd.service -# install firewalld policy needed for tracking and marking packets -install -D -m 0644 %{SOURCE4} %{buildroot}/%{_prefix}/lib/firewalld/services/tcpcryptd.xml %files libs %doc README.markdown @@ -80,7 +75,6 @@ install -D -m 0644 %{SOURCE4} %{buildroot}/%{_prefix}/lib/firewalld/services/tcp %{_mandir}/man8/* %attr(0644,root,root) %{_tmpfilesdir}/tcpcrypt.conf %attr(0644,root,root) %{_unitdir}/tcpcryptd.service -%attr(0644,root,root) %{_prefix}/lib/firewalld/services/tcpcryptd.xml %attr(0755,tcpcryptd,tcpcryptd) %dir /run/tcpcryptd %files devel @@ -106,6 +100,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Thu Feb 23 2023 Eric Garver - 0.5-11 +- remove broken firewalld service definition + * Sat Jan 21 2023 Fedora Release Engineering - 0.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/tcpcryptd-firewall b/tcpcryptd-firewall index e598db8..65a6cee 100755 --- a/tcpcryptd-firewall +++ b/tcpcryptd-firewall @@ -1,19 +1,6 @@ #!/bin/sh -# Check if we need to use firewalld or will handle rules directly with iptables - - -systemctl status firewalld.service >/dev/null -RETVAL=$? -if [ $RETVAL -eq 0 ] -then - # use firewalld - firewall-cmd --reload - firewall-cmd --direct --get-rules ipv4 raw tcpcrypt - firewall-cmd --direct --get-rules ipv4 mangle tcpcrypt -else - # use iptables manually - +# use iptables manually if [ "$1" == "start" ] then iptables -t raw -N tcpcrypt @@ -34,5 +21,3 @@ then iptables -t mangle -F tcpcrypt iptables -t mangle -D PREROUTING -j tcpcrypt fi - -fi From 5fae8d3e2106ce91e4ab98623771abbb8789b1f7 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Thu, 23 Feb 2023 09:37:32 -0500 Subject: [PATCH 26/33] fix: remove bash-isms --- tcpcrypt.spec | 5 ++++- tcpcryptd-firewall | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index a2aab3a..f86f51c 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 11%{?dist} +Release: 12%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -100,6 +100,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Thu Feb 23 2023 Eric Garver - 0.5-12 +- remove bash-isms from tcpcryptd-firewall + * Thu Feb 23 2023 Eric Garver - 0.5-11 - remove broken firewalld service definition diff --git a/tcpcryptd-firewall b/tcpcryptd-firewall index 65a6cee..33d1075 100755 --- a/tcpcryptd-firewall +++ b/tcpcryptd-firewall @@ -1,7 +1,7 @@ #!/bin/sh # use iptables manually -if [ "$1" == "start" ] +if [ "$1" = "start" ] then iptables -t raw -N tcpcrypt iptables -t raw -A tcpcrypt -p tcp -m mark --mark 0x0/0x10 -j NFQUEUE --queue-num 666 @@ -13,7 +13,7 @@ then # launch `tcpcryptd` with `-x 0x10` fi -if [ "$1" == "stop" ] +if [ "$1" = "stop" ] then iptables -t raw -F tcpcrypt iptables -t raw -D PREROUTING -j tcpcrypt From 83630378cab74fc7da3f59e3ca6977d80d770f1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 03:18:34 +0000 Subject: [PATCH 27/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index f86f51c..f5af400 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -100,6 +100,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Feb 23 2023 Eric Garver - 0.5-12 - remove bash-isms from tcpcryptd-firewall From 96bd83752f2acc7bc032f34e373702f7108b43e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 05:36:09 +0000 Subject: [PATCH 28/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index f5af400..ab9acb9 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -100,6 +100,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 91b6efd427880225df3d695a424d76f6ae7aef92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 07:10:40 +0000 Subject: [PATCH 29/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index ab9acb9..8a83bbd 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz @@ -100,6 +100,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.5-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8be4d9a4112f91973dec1868bdbc5ec4ec8ddb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:17:55 +0200 Subject: [PATCH 30/33] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- tcpcrypt.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 8a83bbd..2a4a2a8 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,8 +4,9 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 15%{?dist} -License: BSD +Release: 16%{?dist} +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD Url: http://tcpcrypt.org/ Source0: http://tcpcrypt.org//%{name}-%{version}.tar.gz SOURCE1: tmpfiles-tcpcrypt.conf @@ -100,6 +101,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Wed Sep 04 2024 Miroslav Suchý - 0.5-16 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9f91cd0e6bfc1365008a1dd21f04ff615cb58448 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:29:34 +0000 Subject: [PATCH 31/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index 2a4a2a8..cf5642a 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 16%{?dist} +Release: 17%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD Url: http://tcpcrypt.org/ @@ -101,6 +101,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 0.5-16 - convert license to SPDX From 62c4fd5a765ab30ad5f776afc3be53a19df3eac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:39 +0100 Subject: [PATCH 32/33] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- tcpcrypt.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index cf5642a..e61f288 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 17%{?dist} +Release: 18%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD Url: http://tcpcrypt.org/ @@ -22,7 +22,6 @@ BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -Requires(pre): shadow-utils %description Provides a protocol that attempts to encrypt (almost) all of your @@ -47,6 +46,11 @@ Contains libraries used by tcpcryptd server and tcpcrypt-aware applications %prep %autosetup +# Create a sysusers.d config file +cat >tcpcrypt.sysusers.conf </dev/null || groupadd -r tcpcryptd -getent passwd tcpcryptd >/dev/null || \ -useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ --c "tcpcrypt daemon account" tcpcryptd || exit 0 %post %systemd_post tcpcryptd.service @@ -101,6 +103,9 @@ useradd -r -g tcpcryptd -d /var/run/tcpcryptd -s /sbin/nologin \ %systemd_postun_with_restart tcpcryptd.service %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 0.5-18 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 0.5-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3bed1886a7b1d203b3b01725bd8cde80b71c2185 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:08:58 +0000 Subject: [PATCH 33/33] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- tcpcrypt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tcpcrypt.spec b/tcpcrypt.spec index e61f288..050228a 100644 --- a/tcpcrypt.spec +++ b/tcpcrypt.spec @@ -4,7 +4,7 @@ Summary: Opportunistically encrypt TCP connections Name: tcpcrypt Version: 0.5 -Release: 18%{?dist} +Release: 19%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD Url: http://tcpcrypt.org/ @@ -103,6 +103,9 @@ install -m0644 -D tcpcrypt.sysusers.conf %{buildroot}%{_sysusersdir}/tcpcrypt.co %systemd_postun_with_restart tcpcryptd.service %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 0.5-18 - Add sysusers.d config file to allow rpm to create users/groups automatically