|
 |
27639a |
Name: pptp
|
|
|
27639a |
Version: 1.7.2
|
|
|
27639a |
Release: 20%{?dist}
|
|
|
27639a |
Summary: Point-to-Point Tunneling Protocol (PPTP) Client
|
|
|
27639a |
Group: Applications/Internet
|
|
|
27639a |
License: GPLv2+
|
|
|
27639a |
URL: http://pptpclient.sourceforge.net/
|
|
|
27639a |
Source0: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz
|
|
|
27639a |
Source1: pptp-tmpfs.conf
|
|
|
27639a |
Patch0: pptp-1.7.2-compat.patch
|
|
|
27639a |
Patch1: pptp-1.7.2-ip-path.patch
|
|
|
27639a |
Patch2: pptp-1.7.2-pptpsetup.patch
|
|
|
27639a |
Patch3: pptp-1.7.2-makedeps.patch
|
|
|
27639a |
Patch4: pptp-1.7.2-pptpsetup-encrypt.patch
|
|
|
27639a |
Patch5: pptp-1.7.2-pptpsetup-mppe.patch
|
|
|
27639a |
Patch6: pptp-1.7.2-waitpid.patch
|
|
|
27639a |
Patch7: pptp-1.7.2-conn-free.patch
|
|
|
27639a |
Patch8: pptp-1.7.2-conn-free2.patch
|
|
|
27639a |
Patch9: pptp-1.7.2-call-disconnect-notify.patch
|
|
|
27639a |
Patch10: pptp-1.7.2-so_mark.patch
|
|
|
27639a |
Patch11: pptp-1.7.2-nohostroute-option.patch
|
|
|
27639a |
Patch12: pptp-1.7.2-parallel-build.patch
|
|
|
27639a |
Patch13: pptp-1.7.2-fsf-update.patch
|
|
|
27639a |
Patch14: pptp-1.7.2-sign-compare.patch
|
|
|
27639a |
Patch15: pptp-1.7.2-const.patch
|
|
|
27639a |
Patch16: pptp-1.7.2-field-init.patch
|
|
|
27639a |
Patch17: pptp-1.7.2-unused.patch
|
|
|
27639a |
Patch18: pptp-1.7.2-prototype.patch
|
|
|
27639a |
Patch19: pptp-1.7.2-nested-externs.patch
|
|
|
27639a |
Patch20: pptp-1.7.2-aliasing.patch
|
|
|
27639a |
Patch21: pptp-1.7.2-options.pptp.patch
|
|
|
27639a |
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
|
|
27639a |
BuildRequires: /usr/bin/pod2man
|
|
|
27639a |
Requires: ppp >= 2.4.2, /sbin/ip
|
|
|
27639a |
%if 0%{?fedora} > 14
|
|
|
27639a |
Requires: systemd-units
|
|
|
27639a |
%endif
|
|
|
27639a |
|
|
|
27639a |
%description
|
|
|
27639a |
Client for the proprietary Microsoft Point-to-Point Tunneling
|
|
|
27639a |
Protocol, PPTP. Allows connection to a PPTP based VPN as used
|
|
|
27639a |
by employers and some cable and ADSL service providers.
|
|
|
27639a |
|
|
|
27639a |
%package setup
|
|
|
27639a |
Summary: PPTP Tunnel Configuration Script
|
|
|
27639a |
Group: Applications/Internet
|
|
|
27639a |
Requires: %{name} = %{version}-%{release}
|
|
|
27639a |
|
|
|
27639a |
%description setup
|
|
|
27639a |
This package provides a simple configuration script for setting up PPTP
|
|
|
27639a |
tunnels.
|
|
|
27639a |
|
|
|
27639a |
%prep
|
|
|
27639a |
%setup -q
|
|
|
27639a |
|
|
|
27639a |
# Remove reference to stropts.h, not shipped in F9 onwards (applied upstream)
|
|
|
27639a |
%patch0 -p0 -b .compat
|
|
|
27639a |
|
|
|
27639a |
# Make location of "ip" binary build-time configurable (applied upstream)
|
|
|
27639a |
%patch1 -p0 -b .ip-path
|
|
|
27639a |
|
|
|
27639a |
# Retain permissions on /etc/ppp/chap-secrets (#492090, applied upstream)
|
|
|
27639a |
%patch2 -p0 -b .bz492090
|
|
|
27639a |
|
|
|
27639a |
# Fix Makefile dependencies to support parallel make (applied upstream)
|
|
|
27639a |
%patch3 -p0 -b .makedeps
|
|
|
27639a |
%patch12 -p0 -b .parallel
|
|
|
27639a |
|
|
|
27639a |
# Don't check for MPPE capability in kernel or pppd unless we're creating a
|
|
|
27639a |
# tunnel that requires encryption (applied upstream)
|
|
|
27639a |
%patch4 -p0 -b .encrypt
|
|
|
27639a |
|
|
|
27639a |
# Don't check for MPPE capability in kernel and pppd at all because current
|
|
|
27639a |
# Fedora releases and EL ≥ 5 include MPPE support out of the box (#502967)
|
|
|
27639a |
%patch5 -p1 -b .mppe
|
|
|
27639a |
|
|
|
27639a |
# Fix waitpid usage (upstream patch)
|
|
|
27639a |
%patch6 -p0 -b .waitpid
|
|
|
27639a |
|
|
|
27639a |
# Move free of connection struct out of main loop (upstream patch)
|
|
|
27639a |
%patch7 -p0 -b .conn-free
|
|
|
27639a |
|
|
|
27639a |
# Avoid using connection struct after it is freed (upstream patch)
|
|
|
27639a |
%patch8 -p0 -b .conn-free2
|
|
|
27639a |
|
|
|
27639a |
# Add call ID of outgoing call so that Call-Disconnect-Notify from peer causes
|
|
|
27639a |
# correct disconnection sequence (upstream patch)
|
|
|
27639a |
%patch9 -p1 -b .cdn
|
|
|
27639a |
|
|
|
27639a |
# Add support for setting SO_MARK for the PPTP TCP control connection as well
|
|
|
27639a |
# as on the GRE packets (upstream patch)
|
|
|
27639a |
%patch10 -p1 -b .so_mark
|
|
|
27639a |
|
|
|
27639a |
# Implement the --nohostroute option that routing.c talks about (upstream patch)
|
|
|
27639a |
%patch11 -p1 -b .nohostroute
|
|
|
27639a |
|
|
|
27639a |
# Update the FSF address references and GPLv2 license text (upstream patch)
|
|
|
27639a |
%patch13 -p0 -b .fsf
|
|
|
27639a |
|
|
|
27639a |
# Fix comparisons between signed and unsigned integers (upstream patch)
|
|
|
27639a |
%patch14 -p1 -b .sign-compare
|
|
|
27639a |
|
|
|
27639a |
# Fix const usage (upstream patch)
|
|
|
27639a |
%patch15 -p1 -b .const
|
|
|
27639a |
|
|
|
27639a |
# Add missing field initializers (upstream patch)
|
|
|
27639a |
%patch16 -p1 -b .field
|
|
|
27639a |
|
|
|
27639a |
# Suppress warnings about possibly unused variables (upstream patch)
|
|
|
27639a |
%patch17 -p1 -b .unused
|
|
|
27639a |
|
|
|
27639a |
# Fix declarations that are not prototypes (upstream patch)
|
|
|
27639a |
%patch18 -p1 -b .prototype
|
|
|
27639a |
|
|
|
27639a |
# Fix warnings about nested externs (upstream patch)
|
|
|
27639a |
%patch19 -p1 -b .nested
|
|
|
27639a |
|
|
|
27639a |
# Fix aliasing issues (upstream patch)
|
|
|
27639a |
%patch20 -p1 -b .alias
|
|
|
27639a |
|
|
|
27639a |
# Additional commentary in options.pptp regarding encryption (upstream patch)
|
|
|
27639a |
%patch21 -b .options-comments
|
|
|
27639a |
|
|
|
27639a |
# Pacify rpmlint
|
|
|
27639a |
perl -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile
|
|
|
27639a |
|
|
|
27639a |
%build
|
|
|
27639a |
OUR_CFLAGS="-Wall %{optflags} -Wextra -Wstrict-aliasing=2 -Wnested-externs -Wstrict-prototypes"
|
|
|
27639a |
make %{?_smp_mflags} CFLAGS="$OUR_CFLAGS" IP=/sbin/ip
|
|
|
27639a |
|
|
|
27639a |
%install
|
|
|
27639a |
rm -rf %{buildroot}
|
|
|
27639a |
make DESTDIR=%{buildroot} install
|
|
|
27639a |
install -d -m 750 %{buildroot}%{_localstatedir}/run/pptp
|
|
|
27639a |
|
|
|
27639a |
# Make sure /var/run/pptp exists at boot time for systems
|
|
|
27639a |
# with /var/run on tmpfs (#656672)
|
|
|
27639a |
%if 0%{?fedora} > 14
|
|
|
27639a |
install -d -m 755 %{buildroot}%{_prefix}/lib/tmpfiles.d
|
|
|
27639a |
install -p -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d/pptp.conf
|
|
|
27639a |
%endif
|
|
|
27639a |
|
|
|
27639a |
%clean
|
|
|
27639a |
rm -rf %{buildroot}
|
|
|
27639a |
|
|
|
27639a |
%files
|
|
|
27639a |
%defattr(-,root,root,-)
|
|
|
27639a |
%doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING
|
|
|
27639a |
%doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY
|
|
|
27639a |
%if 0%{?fedora} > 14
|
|
|
27639a |
%{_prefix}/lib/tmpfiles.d/pptp.conf
|
|
|
27639a |
%endif
|
|
|
27639a |
%{_sbindir}/pptp
|
|
|
27639a |
%{_mandir}/man8/pptp.8*
|
|
|
27639a |
%dir %attr(750,root,root) %{_localstatedir}/run/pptp/
|
|
|
27639a |
%config(noreplace) %{_sysconfdir}/ppp/options.pptp
|
|
|
27639a |
|
|
|
27639a |
%files setup
|
|
|
27639a |
%defattr(-,root,root,-)
|
|
|
27639a |
%{_sbindir}/pptpsetup
|
|
|
27639a |
%{_mandir}/man8/pptpsetup.8*
|
|
|
27639a |
|
|
|
27639a |
%changelog
|
|
|
27639a |
* Thu Feb 14 2013 Paul Howarth <paul@city-fan.org> 1.7.2-20.0.cf
|
|
|
27639a |
- BR: /usr/bin/pod2man for generation of pptpsetup man page
|
|
|
27639a |
|
|
|
27639a |
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2-19
|
|
|
27639a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
27639a |
|
|
|
27639a |
* Tue Nov 27 2012 Paul Howarth <paul@city-fan.org> 1.7.2-18
|
|
|
27639a |
- Don't hard-code /etc (#880574)
|
|
|
27639a |
|
|
|
27639a |
* Fri Aug 31 2012 Paul Howarth <paul@city-fan.org> 1.7.2-17
|
|
|
27639a |
- Add note in options.pptp about MPPE not being available in FIPS mode
|
|
|
27639a |
(#845112)
|
|
|
27639a |
- Add note in options.pptp about PPTP with MSCHAP-V2 being insecure
|
|
|
27639a |
|
|
|
27639a |
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> 1.7.2-16
|
|
|
27639a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
27639a |
|
|
|
27639a |
* Wed Jul 4 2012 Paul Howarth <paul@city-fan.org> 1.7.2-15
|
|
|
27639a |
- Move tmpfiles.d config from %%{_sysconfdir} to %%{_prefix}/lib
|
|
|
27639a |
|
|
|
27639a |
* Wed Jan 4 2012 Paul Howarth <paul@city-fan.org> 1.7.2-14
|
|
|
27639a |
- Build with warning-fix patches to address occasional segfaults (#749455)
|
|
|
27639a |
- Patches have all now been merged upstream
|
|
|
27639a |
|
|
|
27639a |
* Wed Nov 30 2011 Paul Howarth <paul@city-fan.org> 1.7.2-13.2
|
|
|
27639a |
- Add patch to fix highly-parallel build (e.g. -j16)
|
|
|
27639a |
- Add additional compiler warning flags to highlight questionable code
|
|
|
27639a |
- Add patch to fix comparisons between signed and unsigned integers
|
|
|
27639a |
- Add patch to fix const usage
|
|
|
27639a |
- Add patch to fix missing field initializers
|
|
|
27639a |
- Add patch to suppress warnings about possibly unused variables
|
|
|
27639a |
- Add patch to fix declarations that are not prototypes
|
|
|
27639a |
- Add patch to fix warnings about nested externs
|
|
|
27639a |
- Add patch to fix dubious typecasts that violate strict-aliasing rules
|
|
|
27639a |
- Update the FSF address references and GPLv2 license text
|
|
|
27639a |
- Use default optimization level (-O2) again
|
|
|
27639a |
|
|
|
27639a |
* Fri Nov 11 2011 Paul Howarth <paul@city-fan.org> 1.7.2-13.1
|
|
|
27639a |
- Drop compiler optimization level to -O0 as per upstream in attempt to
|
|
|
27639a |
resolve occasional segfault in pptpcm (#749455)
|
|
|
27639a |
- Add patch to fix highly-parallel build (e.g. -j16)
|
|
|
27639a |
|
|
|
27639a |
* Tue Nov 8 2011 Paul Howarth <paul@city-fan.org> 1.7.2-13
|
|
|
27639a |
- Patch to fix broken Call-Disconnect-Notify code accepted upstream
|
|
|
27639a |
- Add upstream patch to support setting SO_MARK for the PPTP TCP control
|
|
|
27639a |
connection as well as on the GRE packets
|
|
|
27639a |
- Add upstream patch to implement the --nohostroute option
|
|
|
27639a |
- Nobody else likes macros for commands
|
|
|
27639a |
|
|
|
27639a |
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> 1.7.2-12
|
|
|
27639a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
27639a |
|
|
|
27639a |
* Tue Nov 30 2010 Paul Howarth <paul@city-fan.org> 1.7.2-11
|
|
|
27639a |
- Require systemd-units for ownership of /etc/tmpfiles.d directory
|
|
|
27639a |
- Fix Call-Disconnect-Notify operation
|
|
|
27639a |
|
|
|
27639a |
* Thu Nov 25 2010 Paul Howarth <paul@city-fan.org> 1.7.2-10
|
|
|
27639a |
- Add /etc/tmpfiles.d/pptp.conf to create /var/run/pptp at boot time for
|
|
|
27639a |
systems with /var/run on tmpfs (#656672)
|
|
|
27639a |
|
|
|
27639a |
* Wed Jun 16 2010 Paul Howarth <paul@city-fan.org> 1.7.2-9
|
|
|
27639a |
- Add some fixes from CVS:
|
|
|
27639a |
- Fix waitpid usage
|
|
|
27639a |
- Move free of connection struct out of main loop
|
|
|
27639a |
- Avoid using connection struct after it is freed
|
|
|
27639a |
|
|
|
27639a |
* Thu Sep 24 2009 Paul Howarth <paul@city-fan.org> 1.7.2-8
|
|
|
27639a |
- Split pptpsetup into subpackage to avoid perl dependency (#524972)
|
|
|
27639a |
|
|
|
27639a |
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2-7
|
|
|
27639a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
27639a |
|
|
|
27639a |
* Mon Jun 1 2009 Paul Howarth <paul@city-fan.org> 1.7.2-6
|
|
|
27639a |
- Don't check for MPPE capability in kernel and pppd unless we're creating a
|
|
|
27639a |
tunnel that requires encryption
|
|
|
27639a |
- Don't check for MPPE capability in kernel and pppd at all because current
|
|
|
27639a |
Fedora releases and EL >= 5 include MPPE support out of the box (#502967)
|
|
|
27639a |
|
|
|
27639a |
* Wed Mar 25 2009 Paul Howarth <paul@city-fan.org> 1.7.2-5
|
|
|
27639a |
- Retain permissions on /etc/ppp/chap-secrets when using pptpsetup (#492090)
|
|
|
27639a |
- Use upstream versions of patches
|
|
|
27639a |
- Re-enable parallel build; Makefile dependencies now fixed
|
|
|
27639a |
- Use perl rather than sed to edit Makefile, for spec compatibility with
|
|
|
27639a |
ancient distro releases
|
|
|
27639a |
|
|
|
27639a |
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.2-4
|
|
|
27639a |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
27639a |
|
|
|
27639a |
* Mon May 19 2008 Paul Howarth <paul@city-fan.org> 1.7.2-3
|
|
|
27639a |
- Add dependency on /sbin/ip
|
|
|
27639a |
- Disable parallel make - object files are missing dependency on config.h
|
|
|
27639a |
|
|
|
27639a |
* Mon May 19 2008 Paul Howarth <paul@city-fan.org> 1.7.2-2
|
|
|
27639a |
- Use /sbin/ip, not /bin/ip for routing
|
|
|
27639a |
|
|
|
27639a |
* Wed May 14 2008 Paul Howarth <paul@city-fan.org> 1.7.2-1
|
|
|
27639a |
- Update to 1.7.2
|
|
|
27639a |
- New script and manpage: pptpsetup
|
|
|
27639a |
- Add patch to remove reference to stropts.h, not shipped in F9 onwards
|
|
|
27639a |
|
|
|
27639a |
* Wed Feb 13 2008 Paul Howarth <paul@city-fan.org> 1.7.1-4
|
|
|
27639a |
- Rebuild with gcc 4.3.0 for Fedora 9
|
|
|
27639a |
|
|
|
27639a |
* Fri Aug 24 2007 Paul Howarth <paul@city-fan.org> 1.7.1-3
|
|
|
27639a |
- Change download URL from df.sf.net to downloads.sf.net
|
|
|
27639a |
- Expand tabs in spec
|
|
|
27639a |
- Clarify license as GPL version 2 or later
|
|
|
27639a |
|
|
|
27639a |
* Wed Aug 30 2006 Paul Howarth <paul@city-fan.org> 1.7.1-2
|
|
|
27639a |
- FE6 mass rebuild
|
|
|
27639a |
|
|
|
27639a |
* Mon Feb 13 2006 Paul Howarth <paul@city-fan.org> 1.7.1-1
|
|
|
27639a |
- new upstream version 1.7.1 (fixes #166394)
|
|
|
27639a |
- include new document PROTOCOL-SECURITY
|
|
|
27639a |
- cosmetic change: replace variables with macros
|
|
|
27639a |
|
|
|
27639a |
* Wed Aug 10 2005 Paul Howarth <paul@city-fan.org> 1.7.0-2
|
|
|
27639a |
- own directory %%{_localstatedir}/run/pptp
|
|
|
27639a |
|
|
|
27639a |
* Thu Jul 28 2005 Paul Howarth <paul@city-fan.org> 1.7.0-1
|
|
|
27639a |
- new upstream version 1.7.0
|
|
|
27639a |
- remove patch, included upstream
|
|
|
27639a |
- edit Makefile to prevent attempted chown in %%install
|
|
|
27639a |
- remove redundant %%attr tag in %%files
|
|
|
27639a |
- honour $RPM_OPT_FLAGS
|
|
|
27639a |
- ensure directories have correct permissions
|
|
|
27639a |
|
|
|
27639a |
* Fri May 27 2005 Paul Howarth <paul@city-fan.org> 1.6.0-5
|
|
|
27639a |
- bump and rebuild
|
|
|
27639a |
|
|
|
27639a |
* Tue May 17 2005 Paul Howarth <paul@city-fan.org> 1.6.0-4
|
|
|
27639a |
- rebuild with dist tags
|
|
|
27639a |
|
|
|
27639a |
* Tue May 10 2005 Paul Howarth <paul@city-fan.org> 1.6.0-3
|
|
|
27639a |
- fix URL for SOURCE0 not to point to a specific sf.net mirror
|
|
|
27639a |
|
|
|
27639a |
* Tue May 10 2005 Paul Howarth <paul@city-fan.org> 1.6.0-2
|
|
|
27639a |
- Weed out documentation useful only to developers
|
|
|
27639a |
- Add dist tag
|
|
|
27639a |
- Use full URL for SOURCE0
|
|
|
27639a |
- Fix permissions on %%{_sbindir}/pptp
|
|
|
27639a |
|
|
|
27639a |
* Fri May 6 2005 Paul Howarth <paul@city-fan.org> 1.6.0-1
|
|
|
27639a |
- First build for Fedora Extras, based on upstream spec file
|