diff --git a/.gitignore b/.gitignore index 78cf322..f9c375d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vtun-3.0.1.tar.gz /vtun-3.0.1.tar.gz +/vtun-3.0.3.tar.gz diff --git a/sources b/sources index 6c68109..d62f2f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c342ffe77055d4248a38f0b380f28c1b vtun-3.0.1.tar.gz +f3becf2a0270910a841060c08d1db824 vtun-3.0.3.tar.gz diff --git a/vtun-nostrip.patch b/vtun-nostrip.patch new file mode 100644 index 0000000..fb4aa65 --- /dev/null +++ b/vtun-nostrip.patch @@ -0,0 +1,10 @@ +diff -up vtun-3.0.3/Makefile.in~ vtun-3.0.3/Makefile.in +--- vtun-3.0.3/Makefile.in~ 2012-07-09 07:55:38.000000000 +0300 ++++ vtun-3.0.3/Makefile.in 2012-09-16 16:12:41.176283091 +0300 +@@ -99,6 +99,5 @@ install: vtund install_config install_ma + $(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.spec b/vtun.spec index e917e32..bf5be37 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun -Version: 3.0.1 -Release: 15%{?dist} +Version: 3.0.3 +Release: 5%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -8,10 +8,15 @@ Url: http://vtun.sourceforge.net Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: vtun.socket Source2: vtun.service +Patch0: vtun-nostrip.patch +Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units +BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units autoconf + +#enable PIE/PIC: +%global _hardened_build 1 %description VTun provides a method for creating Virtual Tunnels over TCP/IP networks @@ -25,8 +30,10 @@ require modification to any kernel parts. %prep %setup -q +%patch0 -p1 %build +%{__autoconf} %configure make %{?_smp_mflags} @@ -36,23 +43,13 @@ install -D -m 0644 -p %{SOURCE2} %{buildroot}/%{_unitdir}/vtun.service make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %post -if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post vtun.service vtun.socket %preun -if [ $1 -eq 0 ]; then - /bin/systemctl --no-reload disable vtun.socket >/dev/null 2>&1 || : - /bin/systemctl --no-reload disable vtun.service >/dev/null 2>&1 || : - /bin/systemctl stop vtun.socket >/dev/null 2>&1 || : - /bin/systemctl stop vtun.service >/dev/null 2>&1 || : -fi +%systemd_preun vtun.service vtun.socket %postun -if [ $1 -eq 1 ]; then - /bin/systemctl try-restart vtun.socket >/dev/null 2>&1 || : - /bin/systemctl try-restart vtun.service >/dev/null 2>&1 || : -fi +%systemd_postun vtun.service vtun.socket %files %defattr(-,root,root,-) @@ -68,6 +65,22 @@ fi %{_mandir}/man8/vtund.8* %changelog +* Mon May 13 2013 Gabriel Somlo 2.0.5-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