rpms/ppp/devel ppp-2.4.4-closelog.patch, NONE, 1.1 ppp-2.4.4-response_len.patch, NONE, 1.1 ppp.spec, 1.43, 1.44
Martin Nagy (mnagy)
fedora-extras-commits at redhat.com
Wed Mar 12 08:57:09 UTC 2008
Author: mnagy
Update of /cvs/extras/rpms/ppp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27826
Modified Files:
ppp.spec
Added Files:
ppp-2.4.4-closelog.patch ppp-2.4.4-response_len.patch
Log Message:
* Thu Mar 06 2008 Martin Nagy <mnagy at redhat.com> 2.4.4-6
- call closelog earlier (#222295)
- fix ChapMS2 (#217076)
- moving header files to new -devel package (#203542)
ppp-2.4.4-closelog.patch:
--- NEW FILE ppp-2.4.4-closelog.patch ---
diff -up ppp-2.4.4/pppd/main.c.closelog ppp-2.4.4/pppd/main.c
--- ppp-2.4.4/pppd/main.c.closelog 2008-03-06 22:54:19.000000000 +0100
+++ ppp-2.4.4/pppd/main.c 2008-03-06 22:54:31.000000000 +0100
@@ -1567,6 +1567,8 @@ safe_fork(int infd, int outfd, int errfd
if (errfd == 0 || errfd == 1)
errfd = dup(errfd);
+ closelog();
+
/* dup the in, out, err fds to 0, 1, 2 */
if (infd != 0)
dup2(infd, 0);
@@ -1575,7 +1577,6 @@ safe_fork(int infd, int outfd, int errfd
if (errfd != 2)
dup2(errfd, 2);
- closelog();
if (log_to_fd > 2)
close(log_to_fd);
if (the_channel->close)
ppp-2.4.4-response_len.patch:
--- NEW FILE ppp-2.4.4-response_len.patch ---
diff -up ppp-2.4.4/pppd/chap_ms.c.response_len ppp-2.4.4/pppd/chap_ms.c
--- ppp-2.4.4/pppd/chap_ms.c.response_len 2008-03-06 23:07:18.000000000 +0100
+++ ppp-2.4.4/pppd/chap_ms.c 2008-03-06 23:07:49.000000000 +0100
@@ -852,7 +852,7 @@ ChapMS2(u_char *rchallenge, u_char *Peer
u_char *p = &response[MS_CHAP2_PEER_CHALLENGE];
int i;
- BZERO(response, sizeof(*response));
+ BZERO(response, MS_CHAP2_RESPONSE_LEN);
/* Generate the Peer-Challenge if requested, or copy it if supplied. */
if (!PeerChallenge)
Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ppp.spec 3 Mar 2008 14:55:40 -0000 1.43
+++ ppp.spec 12 Mar 2008 08:56:38 -0000 1.44
@@ -1,7 +1,7 @@
Summary: The PPP (Point-to-Point Protocol) daemon.
Name: ppp
Version: 2.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
License: distributable
Group: System Environment/Daemons
Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -24,6 +24,8 @@
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-closelog.patch
+Patch25: ppp-2.4.4-response_len.patch
BuildRoot: %{_tmppath}/%{name}-root
BuildPrereq: pam-devel, libpcap-devel
@@ -36,6 +38,13 @@
usually used to dial in to an ISP (Internet Service Provider) or other
organization over a modem and phone line.
+%package devel
+Summary: Headers for ppp plugin development
+Group: Development/Libraries
+
+%description devel
+This package contains the header files for building plugins for ppp.
+
%prep
%setup -q
%patch0 -p1 -b .make
@@ -57,6 +66,8 @@
%patch21 -p1 -b .usepeerdns-var_run_ppp_resolv
%patch22 -p1 -b .cbcp
%patch23 -p1 -b .dontwriteetc
+%patch24 -p1 -b .closelog
+%patch25 -p1 -b .response_len
rm -f scripts/*.local
rm -f scripts/*.change_resolv_conf
@@ -104,7 +115,6 @@
%{_mandir}/man8/pppd-radattr.8*
%{_mandir}/man8/pppd-radius.8*
%{_mandir}/man8/pppstats.8*
-%{_includedir}/pppd
%{_libdir}/pppd
%dir /etc/ppp
%dir /var/run/ppp
@@ -114,10 +124,19 @@
%config /etc/ppp/pap-secrets
%config /etc/pam.d/ppp
%config /etc/logrotate.d/ppp
-%doc FAQ PLUGINS README README.cbcp README.linux README.MPPE README.MSCHAP80 README.MSCHAP81 README.pwfd README.pppoe scripts sample
+%doc FAQ README README.cbcp README.linux README.MPPE README.MSCHAP80 README.MSCHAP81 README.pwfd README.pppoe scripts sample
+%files devel
+%defattr(-,root,root)
+%{_includedir}/pppd
+%doc PLUGINS
%changelog
+* Thu Mar 06 2008 Martin Nagy <mnagy at redhat.com> 2.4.4-6
+- call closelog earlier (#222295)
+- fix ChapMS2 (#217076)
+- moving header files to new -devel package (#203542)
+
* Mon Mar 03 2008 Martin Nagy <mnagy at redhat.com> 2.4.4-5
- put logs into /var/log/ppp (#118837)
More information about the fedora-extras-commits
mailing list