ppp-2.4.6-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8583 ec354946-7b23-47d6-9f5a-488ba84defc7

p/ppp/ppp-vl.spec

@@ -1,37 +1,62 @@
+%bcond_with ifupdown
+
+%define _tmpfilesdir %{_sysconfdir}/tmpfiles.d
+
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Summary(ja): PPP (Point-to-Point Protocol) デーモン
 Name: ppp
-Version: 2.4.5
-Release: 4%{?_dist_release}
+Version: 2.4.6
+Release: 1%{?_dist_release}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
 
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
-Source1: ppp-2.4.4-pamd.conf
-Patch0: ppp-2.4.3-make.patch
-Patch1: ppp-2.3.6-sample.patch
-Patch2: ppp-2.4.2-libutil.patch
-Patch3: ppp-2.4.1-varargs.patch
-Patch4: ppp-2.4.4-lib64.patch
-Patch7: ppp-2.4.2-pie.patch
-Patch8: ppp-2.4.3-fix.patch
-Patch9: ppp-2.4.3-fix64.patch
-Patch11: ppp-2.4.2-change_resolv_conf.patch
-Patch13: ppp-2.4.4-no_strip.patch
-Patch17: ppp-2.4.2-pppoatm-make.patch
-Patch19: ppp-2.4.3-local.patch
-Patch20: ppp-2.4.3-ipv6-accept-remote.patch
-Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
-Patch22: ppp-2.4.4-cbcp.patch
-Patch23: ppp-2.4.2-dontwriteetc.patch
-Patch24: ppp-2.4.4-fd_leak.patch
-Patch25: ppp-2.4.5-var_run_ppp.patch
+Source1: ppp-pam.conf
+Source2: ppp-logrotate.conf
+Source3: ppp-tmpfiles.conf
+Source4: ip-down
+Source5: ip-down.ipv6to4
+Source6: ip-up
+Source7: ip-up.ipv6to4
+Source8: ipv6-down
+Source9: ipv6-up
+Source10: ifup-ppp
+Source11: ifdown-ppp
+Source12: ppp-watch.tar.xz
+
+# Fedora-specific
+Patch0001: 0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
+Patch0002: 0002-build-sys-enable-PAM-support.patch
+Patch0003: 0003-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
+Patch0004: 0004-doc-add-configuration-samples.patch
+Patch0005: 0005-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
+Patch0006: 0006-scritps-use-change_resolv_conf-function.patch
+Patch0007: 0007-build-sys-don-t-strip-binaries-during-installation.patch
+Patch0008: 0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
+Patch0009: 0009-pppd-introduce-ipv6-accept-remote.patch
+Patch0010: 0010-build-sys-enable-CBCP.patch
+Patch0011: 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+Patch0012: 0012-pppd-we-don-t-want-to-accidentally-leak-fds.patch
+Patch0013: 0013-everywhere-O_CLOEXEC-harder.patch
+Patch0014: 0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
+Patch0015: 0015-pppd-move-pppd-database-to-var-run-ppp.patch
+Patch0016: 0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
+Patch0017: 0017-pppd-rebase-EAP-TLS-patch-v0.994.patch
+Patch0018: 0018-scritps-fix-ip-up.local-sample.patch
+Patch0019: 0019-sys-linux-rework-get_first_ethernet.patch
+Patch0020: 0020-pppd-put-lock-files-in-var-lock-ppp.patch
+Patch0021: 0021-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
+Patch0022: 0022-build-sys-compile-pppol2tp-with-multilink-support.patch
+Patch0023: 0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
+Patch0024: 0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
+Patch0025: 0025-pppd-install-pppd-binary-using-standard-perms-755.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libpcap >= 0.8.3, pam-devel
+BuildRequires: glib2-devel, libpcap >= 0.8.3, libudev-devel, openssl-devel, pam-devel
 #Requires: glibc >= 2.0.6, /etc/pam.d/system-auth
 Requires: glibc >= 2.0.6, pam >= 1.0
+Requires(pre): shadow-utils
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -66,92 +91,96 @@ This package contains the header files for building plugins for ppp.
 
 %prep
 %setup  -q
+%autopatch -p1
 
-%patch0 -p1 -b .make
-%patch1 -p1 -b .sample
-%patch2 -p1 -b .libutil
-%patch3 -p1 -b .varargs
-%patch4 -p1 -b .lib64
-%patch7 -p1 -b .pie
-%patch8 -p1 -b .fix
-%patch9 -p1 -b .fix64
-%patch11 -p1 -b .change_resolv_conf
-%patch13 -p1 -b .no_strip
-%patch17 -p1 -b .atm-make
-%patch19 -p1 -b .local
-%patch20 -p1 -b .ipv6cp
-%patch21 -p1 -b .usepeerdns-var_run_ppp_resolv
-%patch22 -p1 -b .cbcp
-%patch23 -p1 -b .dontwriteetc
-%patch24 -p1 -b .fd_leak
-%patch25 -p1 -b .var_run_ppp
-
-rm -f scripts/*.local
-rm -f scripts/*.change_resolv_conf
-rm -f scripts/*.usepeerdns-var_run_ppp_resolv
-rm -f scripts/*.ppp_resolv
-
-find . -type f -name "*.sample" | xargs rm -f 
-
-rm -f include/linux/if_pppol2tp.h
+tar -xJf %{SOURCE12}
 
 %build
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall"
-./configure
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall"
+%configure
+make %{?_smp_mflags}
+make -C ppp-watch %{?_smp_mflags}
 
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-export INSTROOT=$RPM_BUILD_ROOT
+
 %ifarch x86_64
-make install install-etcppp LIBDIR=$RPM_BUILD_ROOT%{_libdir}/pppd/%{version}
+make INSTROOT=%{buildroot} install install-etcppp LIBDIR=$RPM_BUILD_ROOT%{_libdir}/pppd/%{version}
 %else
-make install install-etcppp
+make INSTROOT=%{buildroot} install install-etcppp
 %endif
 
-mv %{buildroot}/usr/var %{buildroot}/
+find scripts -type f | xargs chmod a-x
+
+make ROOT=%{buildroot} -C ppp-watch install
+
+# create log files dir
+mv -f %{buildroot}/usr/var %{buildroot}/
+
+# install pam config
+install -d %{buildroot}%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp
 
-## it shouldn't be SUID root be default
-#chmod 755 %{buildroot}/usr/sbin/pppd
+# install logrotate script
+install -d %{buildroot}%{_sysconfdir}/logrotate.d
+install -p %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ppp
 
-chmod go+r scripts/*
-mkdir -p %{buildroot}/etc/pam.d
-install -m 644 %{SOURCE1} %{buildroot}/etc/pam.d/ppp
+# install tmpfiles drop-in
+install -d %{buildroot}%{_tmpfilesdir}
+install -p %{SOURCE3} %{buildroot}%{_tmpfilesdir}/ppp.conf
 
-mkdir -p %{buildroot}/etc/ppp
-cp etc.ppp/* %{buildroot}/etc/ppp
-chmod 600 %{buildroot}/etc/ppp/*-secrets
+# install scripts (previously owned by initscripts package)
+install -d %{buildroot}%{_sysconfdir}/ppp
+%if %{with ifupdown}
+install -p %{SOURCE4} %{buildroot}%{_sysconfdir}/ppp/ip-down
+install -p %{SOURCE5} %{buildroot}%{_sysconfdir}/ppp/ip-down.ipv6to4
+install -p %{SOURCE6} %{buildroot}%{_sysconfdir}/ppp/ip-up
+install -p %{SOURCE7} %{buildroot}%{_sysconfdir}/ppp/ip-up.ipv6to4
+install -p %{SOURCE8} %{buildroot}%{_sysconfdir}/ppp/ipv6-down
+install -p %{SOURCE9} %{buildroot}%{_sysconfdir}/ppp/ipv6-up
+%endif
 
-mkdir -p %{buildroot}/etc/radiusclient
-cp pppd/plugins/radius/etc/* %{buildroot}/etc/radiusclient
-mv %{buildroot}/etc/radiusclient/radiusclient.conf %{buildroot}/etc/
-perl -pi -e 's|/usr/local||g' %{buildroot}/etc/radiusclient/radiusclient.conf
+%if %{with ifupdown}
+install -d %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/
+install -p %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ppp
+install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdown-ppp
+%endif
 
-find scripts -type f | xargs chmod 644
 
 %clean
 rm -rf %{buildroot}
 
 
+%pre
+/usr/bin/getent group dip >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 40 dip >/dev/null 2>&1 || :
+
+
 %files
 %defattr(-,root,root)
+%doc FAQ README README.cbcp README.linux README.MPPE README.MSCHAP80 README.MSCHAP81 README.pwfd README.pppoe scripts sample README.eap-tls
 %{_sbindir}/*
 %{_libdir}/pppd
 %{_mandir}/man8/chat.8*
+%{_mandir}/man8/ppp-watch.8*
 %{_mandir}/man8/pppd.8*
 %{_mandir}/man8/pppdump.8*
 %{_mandir}/man8/pppstats.8*
 %{_mandir}/man8/pppd-radattr.8*
 %{_mandir}/man8/pppd-radius.8*
+%{_mandir}/man8/pppoe-discovery.8*
 %dir /etc/ppp
 %config(noreplace) /etc/ppp/*
 %config(noreplace) /etc/pam.d/ppp
-%config(noreplace) /etc/radiusclient/*
-%config(noreplace) /etc/radiusclient.conf
-%doc README README.linux scripts sample
-%dir %{_localstatedir}/run/ppp
-%dir %{_localstatedir}/log/ppp
+%config(noreplace) /etc/logrotate.d/ppp
+%{_tmpfilesdir}/ppp.conf
+%ghost %dir %{_localstatedir}/run/ppp
+%ghost %dir %{_localstatedir}/lock/ppp
+%attr(700, root, root) %dir %{_localstatedir}/log/ppp
+
+%if %{with ifupdown}
+/etc/sysconfig/network-scripts/ifup-ppp
+/etc/sysconfig/network-scripts/ifdown-ppp
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -160,6 +189,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 18 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.6-1
+- new upstream release.
+- replaceed all patches.
+
 * Tue Sep 06 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.5-4
 - added /var/run/ppp to %%files. (BTS:1215)
 - added /var/log/ppp to %%files.
@@ -271,7 +304,7 @@ rm -rf %{buildroot}
 * Fri Apr 09 1999 Cristian Gafton <gafton@redhat.com>
 - force pppd use the glibc's logwtmp instead of implementing its own
 
-* Wed Apr 01 1999 Preston Brown <pbrown@redhat.com>
+* Thu Apr 01 1999 Preston Brown <pbrown@redhat.com>
 - version 2.3.7 bugfix release
 
 * Tue Mar 23 1999 Cristian Gafton <gafton@redhat.com>