2 changed files with 76 additions and 15 deletions
--- a/SOURCES/pptp-1.10.0-man-fix.patch
+++ b/SOURCES/pptp-1.10.0-man-fix.patch
@ -0,0 +1,33 @@
+diff --git a/pptp.8 b/pptp.8
+index 017b5db..9407a2a 100644
+--- a/pptp.8
+++ b/pptp.8
+@@ -119,6 +119,15 @@ Sets the number of packets to pass before causing a reordering test.
+ Default is 100.  Has no effect if test-type is zero.  The result of
+ test types 2 and 3 are undefined if this value is less than ten.
+ 
+.TP
+.B \-\-missing-window <n>
+Enable 'missing window' validation and set packet tolerance
+(300=default, 6000=recommended).
+
+.TP
+.B \-\-version
+Display version.
+
+ 
+ .SH "ROUTING"
+ When PPTP is used in conjunction with a default route on top of the
+diff --git a/pptp.c b/pptp.c
+index 92e3170..25f385c 100644
+--- a/pptp.c
+++ b/pptp.c
+@@ -127,7 +127,7 @@ void usage(char *progname)
+             "  --test-type <type>	Damage the packet stream by reordering\n"
+             "  --test-rate <n>          Do the test every n packets\n"
+             "  --missing-window <n>     Enable 'missing window' validation and set packet\n"
+-            "                           polerance (300=default, 6000=recommended)\n",
+            "                           tolerance (300=default, 6000=recommended)\n",
+ 
+             version, progname, progname);
+     log("%s called with wrong arguments, program not started.", progname);
--- a/SPECS/pptp.spec
+++ b/SPECS/pptp.spec
@ -1,17 +1,18 @@
 Name:		pptp
 Version:	1.10.0
-Release:	4%{?dist}
+Release:	14%{?dist}
 Summary:	Point-to-Point Tunneling Protocol (PPTP) Client
-Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://pptpclient.sourceforge.net/
 Source0:	http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
 Source1:	pptp-tmpfs.conf
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+BuildRequires: make
 BuildRequires:	/usr/bin/pod2man
-BuildRequires:	perl-generators
+BuildRequires:	gcc, perl-generators
 Requires:	ppp >= 2.4.2, /sbin/ip
 Requires:	systemd-units
+# Patch sent upstream
+Patch0:		pptp-1.10.0-man-fix.patch

 %description
 Client for the proprietary Microsoft Point-to-Point Tunneling
@ -20,7 +21,6 @@ by employers and some cable and ADSL service providers.

 %package setup
 Summary:	PPTP Tunnel Configuration Script
-Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}

 %description setup
@ -30,27 +30,25 @@ tunnels.
 %prep
 %setup -q

+%patch0 -p1 -b .man-fix
+
 # Pacify rpmlint
 perl -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile

 %build
 OUR_CFLAGS="-Wall %{optflags} -Wextra -Wstrict-aliasing=2 -Wnested-externs -Wstrict-prototypes"
-make %{?_smp_mflags} CFLAGS="$OUR_CFLAGS" LDFLAGS="$RPM_LD_FLAGS" IP=/sbin/ip
+%{make_build} CFLAGS="$OUR_CFLAGS" LDFLAGS="$RPM_LD_FLAGS" IP=/sbin/ip

 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%{make_install} DESTDIR=%{buildroot}
 install -d -m 750 %{buildroot}%{_localstatedir}/run/pptp


 install -d -m 755 %{buildroot}%{_prefix}/lib/tmpfiles.d
 install -p -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d/pptp.conf

-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
 %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
 %{_prefix}/lib/tmpfiles.d/pptp.conf
@ -60,14 +58,44 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ppp/options.pptp

 %files setup
-%defattr(-,root,root,-)
 %{_sbindir}/pptpsetup
 %{_mandir}/man8/pptpsetup.8*

 %changelog
-* Wed May  6 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1.10.0-4
- Changed run directory location from /var/run to /run
-  Resolves: rhbz#1805972
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.0-14
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.0-13
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu May 14 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1.10.0-10
+- Fixed man page and typo in the built-in help
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jan 11 2020 Paul Wouters <pwouters@redhat.com> - 1.10.0-8
+- fixup tmpfile to use /run instead of /var/run
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 20 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 1.10.0-5
+- Fixed FTBFS by adding gcc requirement
+  Resolves: rhbz#1605498
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild