From 81e15b3a03b89bffe0e6076a235720d40f343292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 19 Jun 2019 09:57:50 +0200 Subject: [PATCH 1/5] Drop use of __* macros that were removed in rpm-4.15 --- vtun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index 51bf3a0..be65c69 100644 --- a/vtun.spec +++ b/vtun.spec @@ -39,7 +39,7 @@ require modification to any kernel parts. %patch0 -p1 %build -%{__autoconf} +autoconf # FIXME: Package suffers from c11/inline issues. # Workaround by appending --std=gnu89 to CFLAGS # Proper fix would be to fix the source-code From aa8d4bc89ecdd71a838620428c57f64d99aab8fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:13:22 +0000 Subject: [PATCH 2/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index be65c69..c382200 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Url: http://vtun.sourceforge.net @@ -81,6 +81,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 82540dc39744fdb24054196fc989dffcde5ee0c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:25:41 +0000 Subject: [PATCH 3/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index c382200..b4f1933 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Url: http://vtun.sourceforge.net @@ -81,6 +81,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 3.0.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4fa3359af56612b1b4539270a66c74212d916769 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:55:01 +0000 Subject: [PATCH 4/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vtun.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index b4f1933..a64e256 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Url: http://vtun.sourceforge.net @@ -81,6 +81,9 @@ EOT %{_mandir}/man8/vtund.8* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 3.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5f702d511109834de5650a8e545c9cf67b0ed872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 3 Nov 2020 00:13:25 +0100 Subject: [PATCH 5/5] Orphaned for 6+ weeks --- .gitignore | 4 - dead.package | 1 + sources | 1 - vtun-nostrip.patch | 12 --- vtun.service | 12 --- vtun.socket | 8 -- vtun.spec | 212 --------------------------------------------- vtun.sysconfig | 16 ---- 8 files changed, 1 insertion(+), 265 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vtun-nostrip.patch delete mode 100644 vtun.service delete mode 100644 vtun.socket delete mode 100644 vtun.spec delete mode 100644 vtun.sysconfig diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2711247..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -vtun-3.0.1.tar.gz -/vtun-3.0.1.tar.gz -/vtun-3.0.3.tar.gz -/vtun-3.0.4.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 1487886..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (vtun-3.0.4.tar.gz) = b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781 diff --git a/vtun-nostrip.patch b/vtun-nostrip.patch deleted file mode 100644 index cd07a1a..0000000 --- a/vtun-nostrip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -NarU5 a/Makefile.in b/Makefile.in ---- a/Makefile.in 2016-10-01 17:46:00.000000000 -0400 -+++ b/Makefile.in 2017-03-17 16:49:16.195772745 -0400 -@@ -97,8 +97,7 @@ - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) - $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) -- $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund - - # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/vtun.service b/vtun.service deleted file mode 100644 index d26d83c..0000000 --- a/vtun.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Virtual Tunnels over TCP/IP networks -After=syslog.target network.target - -[Service] -EnvironmentFile=/etc/sysconfig/vtun -ExecStart=/usr/sbin/vtund -n $OPTIONS -ExecReload=/usr/bin/kill -HUP $MAINPID -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/vtun.socket b/vtun.socket deleted file mode 100644 index 07f9d3d..0000000 --- a/vtun.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Vtun Activation Socket - -[Socket] -ListenStream=5000 - -[Install] -WantedBy=sockets.target diff --git a/vtun.spec b/vtun.spec deleted file mode 100644 index a64e256..0000000 --- a/vtun.spec +++ /dev/null @@ -1,212 +0,0 @@ -Name: vtun -Version: 3.0.4 -Release: 11%{?dist} -Summary: Virtual tunnel over TCP/IP networks -License: GPLv2+ -Url: http://vtun.sourceforge.net -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: vtun.socket -Source2: vtun.service -Source3: vtun.sysconfig -Patch0: vtun-nostrip.patch - -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -BuildRequires: gcc -BuildRequires: zlib-devel lzo-devel bison flex systemd-units autoconf -%if 0%{?fedora} >= 26 -BuildRequires: compat-openssl10-devel -%else -BuildRequires: openssl-devel -%endif - -#enable PIE/PIC: -%global _hardened_build 1 - -%description -VTun provides a method for creating Virtual Tunnels over TCP/IP networks -and allows one to shape, compress, and encrypt traffic in those tunnels. -Supported types of tunnels are: PPP, IP, Ethernet and most other serial -protocols and programs. -VTun is easily and highly configurable: it can be used for various -network tasks like VPN, Mobile IP, Shaped Internet access, IP address -saving, etc. It is completely a user space implementation and does not -require modification to any kernel parts. - -%prep -%setup -q -%patch0 -p1 - -%build -autoconf -# FIXME: Package suffers from c11/inline issues. -# Workaround by appending --std=gnu89 to CFLAGS -# Proper fix would be to fix the source-code -%configure CFLAGS="${RPM_OPT_FLAGS} --std=gnu89" -make %{?_smp_mflags} - -%install -install -D -m 0644 -p %{SOURCE1} %{buildroot}/%{_unitdir}/vtun.socket -install -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service -install -D -m 0644 -p %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/vtun -make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" -# tmpfiles.d configuration for /var/lock/vtund: -mkdir -p %{buildroot}/%{_tmpfilesdir} -cat > %{buildroot}/%{_tmpfilesdir}/%{name}.conf << EOT -d %{_localstatedir}/lock/vtund 0755 root root - -EOT - -%post -%systemd_post vtun.service vtun.socket - -%preun -%systemd_preun vtun.service vtun.socket - -%postun -%systemd_postun vtun.service vtun.socket - -%files -%doc ChangeLog Credits FAQ README README.LZO README.Setup README.Shaper TODO vtund.conf -%config(noreplace) %{_sysconfdir}/vtund.conf -%config(noreplace) %{_sysconfdir}/sysconfig/vtun -%{_unitdir}/vtun.socket -%{_unitdir}/vtun.service -%{_sbindir}/vtund -%{_tmpfilesdir}/%{name}.conf -%dir %{_localstatedir}/log/vtund -%dir %{_localstatedir}/lock/vtund -%{_mandir}/man5/vtund.conf.5* -%{_mandir}/man8/vtun.8* -%{_mandir}/man8/vtund.8* - -%changelog -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 3.0.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 3.0.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 3.0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 3.0.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 3.0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Sep 02 2017 Gabriel Somlo 3.0.3-5 -- remove segfaulting openssl-1.1 patch; use compat-openssl10 instead - -* Sat Sep 02 2017 Gabriel Somlo 3.0.3-4 -- apply openssl-1.1 patch only on Fedora >= 26, to avoid epel7 (#1487003) - -* Thu Aug 03 2017 Fedora Release Engineering - 3.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Mon Jul 31 2017 Gabriel Somlo 3.0.3-2 -- add /usr/lib/tmpfiles.d/vtun.conf to enable lock dir. on tmpfs - -* Fri Mar 17 2017 Gabriel Somlo 3.0.3-1 -- update to 3.0.4 -- patch for openssl-1.1 transition - -* Sat Feb 11 2017 Fedora Release Engineering - 3.0.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Mar 21 2016 Gabriel Somlo 3.0.3-15 -- patch to fix #1319858,#1319859,#1319861 - -* Fri Feb 05 2016 Fedora Release Engineering - 3.0.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jun 22 2015 Ralf Corsépius - 3.0.3-13 -- Append --stdc=gnu89 to CFLAGS (Work-around to c11/inline compatibility - issues. Fix FTBFS). - -* Fri Jun 19 2015 Fedora Release Engineering - 3.0.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Dec 23 2014 Gabriel Somlo 3.0.3-11 -- enhanced service file (remove "KillMode", use default "cgroup" mode) - -* Thu Nov 20 2014 Gabriel Somlo 3.0.3-10 -- enhanced service file (-n to prevent daemonizing vtund) - -* Fri Nov 14 2014 Gabriel Somlo 3.0.3-9 -- added /etc/sysconfig/vtun environment file -- updated unit files - -* Mon Aug 18 2014 Fedora Release Engineering - 3.0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 3.0.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 3.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon May 13 2013 Gabriel Somlo 3.0.3-5 -- added autoconf step to support aarch64 (#926708) - -* Wed May 01 2013 Gabriel Somlo 3.0.3-4 -- rebuild with PIE (#955286) - -* Fri Feb 15 2013 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Sep 16 2012 Gabriel Somlo 3.0.3-2 -- avoid stripping too early to preserve debuginfo (#857716) - -* Thu Sep 13 2012 Gabriel Somlo 3.0.3-1 -- update to 3.0.3 -- new systemd-rpm macros (#850362) - -* Sun Jul 22 2012 Fedora Release Engineering - 3.0.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon May 21 2012 Peter Robinson - 3.0.1-14 -- Fix unit file location, cleanup and modernise spec - -* Sat Jan 14 2012 Fedora Release Engineering - 3.0.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Sep 10 2011 Gabriel Somlo 3.0.1-12 -- removed xinetd and sysvinit support - -* Sat Sep 10 2011 Gabriel Somlo 3.0.1-11 -- update support for systemd (#737195) - -* Mon Feb 07 2011 Fedora Release Engineering - 3.0.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jan 06 2011 Gabriel Somlo 3.0.1-9 -- add support for systemd (#661331) - -* Tue Nov 30 2010 Gabriel Somlo 3.0.1-8 -- using ghost on /var/lock/vtund directory (#656720) - -* Fri Aug 21 2009 Tomas Mraz - 3.0.1-7 -- rebuilt with new openssl - -* Sun Jul 26 2009 Fedora Release Engineering - 3.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Tomas Mraz 3.0.1-4 -- rebuild with new openssl - -* Mon Nov 17 2008 Gabriel Somlo 3.0.1-3 -- scriptlets fixes - -* Fri Nov 14 2008 Gabriel Somlo 3.0.1-2 -- spec file fixes: defattr, -p flag to install program - -* Mon Oct 20 2008 Gabriel Somlo 3.0.1-1 -- initial fedora package diff --git a/vtun.sysconfig b/vtun.sysconfig deleted file mode 100644 index 467bd8b..0000000 --- a/vtun.sysconfig +++ /dev/null @@ -1,16 +0,0 @@ -# Comment out one of the following for client or server mode -# -# To run vtun as a server: -# -#OPTIONS='-s' -# -# -# -#To run vtun as a client, we need: -# -# - session name, e.g. "lion"; must be present in both client and server -# config files. -# -# - server address or host name. -# -#OPTIONS='lion vtun-server.example.com'