dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ppp
-# $Id: Makefile,v 1.1 2004/09/09 10:38:57 cvsdist Exp $
-NAME := ppp
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ppp-2.4.4-new_speeds.patch

@@ -0,0 +1,34 @@
+diff -up ppp-2.4.4/pppd/sys-linux.c.new_speeds ppp-2.4.4/pppd/sys-linux.c
+--- ppp-2.4.4/pppd/sys-linux.c.new_speeds	2008-05-12 17:44:11.000000000 -0400
++++ ppp-2.4.4/pppd/sys-linux.c	2008-05-12 17:50:51.000000000 -0400
+@@ -849,6 +849,30 @@ struct speed {
+ #ifdef B921600
+     { 921600, B921600 },
+ #endif
++#ifdef B1000000
++    { 1000000, B1000000 },
++#endif
++#ifdef B1152000
++    { 1152000, B1152000 },
++#endif
++#ifdef B1500000
++    { 1500000, B1500000 },
++#endif
++#ifdef B2000000
++    { 2000000, B2000000 },
++#endif
++#ifdef B2500000
++    { 2500000, B2500000 },
++#endif
++#ifdef B3000000
++    { 3000000, B3000000 },
++#endif
++#ifdef B3500000
++    { 3500000, B3500000 },
++#endif
++#ifdef B4000000
++    { 4000000, B4000000 },
++#endif
+     { 0, 0 }
+ };
+ 

ppp.spec

@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -26,6 +26,7 @@ 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
+Patch26: ppp-2.4.4-new_speeds.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap-devel
@@ -68,6 +69,7 @@ This package contains the header files for building plugins for ppp.
 %patch23 -p1 -b .dontwriteetc
 %patch24 -p1 -b .closelog
 %patch25 -p1 -b .response_len
+%patch26 -p1 -b .new_speeds
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
@@ -132,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Tue May 13 2008 Martin Nagy <mnagy@redhat.com> 2.4.4-7
+- add new speeds, patch by Jason Vas Dias (#446132)
+
 * Thu Mar 06 2008 Martin Nagy <mnagy@redhat.com> 2.4.4-6
 - call closelog earlier (#222295)
 - fix ChapMS2 (#217076)