From f55bca28a16e5d41a6b79dcc136144766fce978f Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Thu, 13 Sep 2012 10:51:07 -0400 Subject: [PATCH 1/6] update to 3.0.3; new systemd-rpm macros (#850362) --- .gitignore | 1 + sources | 2 +- vtun.spec | 25 ++++++++++--------------- 3 files changed, 12 insertions(+), 16 deletions(-) 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.spec b/vtun.spec index e917e32..a4616af 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: 1%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -9,6 +9,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: vtun.socket Source2: vtun.service +Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units @@ -36,23 +37,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 +59,10 @@ fi %{_mandir}/man8/vtund.8* %changelog +* 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 From 986649a89a41cfcd665c9c0c3aae50e5b9a15f92 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Sun, 16 Sep 2012 10:55:57 -0400 Subject: [PATCH 2/6] avoid stripping too early to preserve debuginfo (#857716) --- vtun.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index a4616af..ba51fc2 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -8,6 +8,7 @@ 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 @@ -26,6 +27,7 @@ require modification to any kernel parts. %prep %setup -q +%patch0 -p1 %build %configure @@ -59,6 +61,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* 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) From b5c89d8582c98996b376500cce61fe8d8c889762 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Sun, 16 Sep 2012 11:01:16 -0400 Subject: [PATCH 3/6] avoid stripping too early to preserve debuginfo (#857716), take 2 --- vtun-nostrip.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 vtun-nostrip.patch 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. From 979982f5d5ea85c2059abd8856dc4c8451457415 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Wed, 1 May 2013 21:33:33 -0400 Subject: [PATCH 4/6] rebuild with PIE (#955286) --- vtun.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vtun.spec b/vtun.spec index ba51fc2..a66c301 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -15,6 +15,9 @@ Requires(preun): systemd-units Requires(postun): systemd-units BuildRequires: zlib-devel lzo-devel openssl-devel bison flex systemd-units +#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. @@ -61,6 +64,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog +* Wed May 01 2013 Gabriel Somlo 3.0.3-3 +- rebuild with PIE (#955286) + * Sun Sep 16 2012 Gabriel Somlo 3.0.3-2 - avoid stripping too early to preserve debuginfo (#857716) From aeddfcc3d42a86aceae5f103ab46769427dfadc8 Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Wed, 1 May 2013 21:47:16 -0400 Subject: [PATCH 5/6] rebuild with PIE (#955286) --- vtun.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vtun.spec b/vtun.spec index a66c301..64c276f 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -64,9 +64,12 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_mandir}/man8/vtund.8* %changelog -* Wed May 01 2013 Gabriel Somlo 3.0.3-3 +* 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) From dd486896a5454239802006dd6015083a0ea75bad Mon Sep 17 00:00:00 2001 From: "Gabriel L. Somlo" Date: Mon, 13 May 2013 10:35:38 -0400 Subject: [PATCH 6/6] added autoconf step to support aarch64 (#926708) --- vtun.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vtun.spec b/vtun.spec index 64c276f..bf5be37 100644 --- a/vtun.spec +++ b/vtun.spec @@ -1,6 +1,6 @@ Name: vtun Version: 3.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual tunnel over TCP/IP networks License: GPLv2+ Group: System Environment/Daemons @@ -13,7 +13,7 @@ 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 @@ -33,6 +33,7 @@ require modification to any kernel parts. %patch0 -p1 %build +%{__autoconf} %configure make %{?_smp_mflags} @@ -64,6 +65,9 @@ make install DESTDIR=%{buildroot} INSTALL_OWNER= INSTALL="/usr/bin/install -p" %{_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)