diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2711247 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +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 deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..1487886 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (vtun-3.0.4.tar.gz) = b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781 diff --git a/vtun-nostrip.patch b/vtun-nostrip.patch new file mode 100644 index 0000000..cd07a1a --- /dev/null +++ b/vtun-nostrip.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 0000000..d26d83c --- /dev/null +++ b/vtun.service @@ -0,0 +1,12 @@ +[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 new file mode 100644 index 0000000..07f9d3d --- /dev/null +++ b/vtun.socket @@ -0,0 +1,8 @@ +[Unit] +Description=Vtun Activation Socket + +[Socket] +ListenStream=5000 + +[Install] +WantedBy=sockets.target diff --git a/vtun.spec b/vtun.spec new file mode 100644 index 0000000..8c642de --- /dev/null +++ b/vtun.spec @@ -0,0 +1,195 @@ +Name: vtun +Version: 3.0.4 +Release: 5%{?dist} +Summary: Virtual tunnel over TCP/IP networks +License: GPLv2+ +Group: System Environment/Daemons +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: 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 +%defattr(-,root,root,-) +%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 +* 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 new file mode 100644 index 0000000..467bd8b --- /dev/null +++ b/vtun.sysconfig @@ -0,0 +1,16 @@ +# 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'