# cd /usr/local/src
# cvs -d :pserver:cvs@pserver.samba.org:/cvsroot login
パスワードはcvs
# cvs -z5 -d :pserver:cvs@pserver.samba.org:/cvsroot co ppp
# cd ppp
# ./configure
# cvs -q diff -u
Index: linux/Makefile.top
===================================================================
RCS file: /cvsroot/ppp/linux/Makefile.top,v
retrieving revision 1.10
diff -u -r1.10 Makefile.top
--- linux/Makefile.top 10 Jun 2002 13:46:26 -0000 1.10
+++ linux/Makefile.top 16 Mar 2003 10:17:37 -0000
@@ -1,9 +1,9 @@
# PPP top-level Makefile for Linux.
-BINDIR = $(DESTDIR)/usr/sbin
-INCDIR = $(DESTDIR)/usr/include
-MANDIR = $(DESTDIR)/usr/man
+BINDIR = $(DESTDIR)/usr/local/sbin
+INCDIR = $(DESTDIR)/usr/local/include
+MANDIR = $(DESTDIR)/usr/local/man
ETCDIR = $(DESTDIR)/etc/ppp
# uid 0 = root
Index: pppd/plugins/Makefile.linux
===================================================================
RCS file: /cvsroot/ppp/pppd/plugins/Makefile.linux,v
retrieving revision 1.11
diff -u -r1.11 Makefile.linux
--- pppd/plugins/Makefile.linux 16 Feb 2003 22:31:24 -0000 1.11
+++ pppd/plugins/Makefile.linux 16 Mar 2003 10:17:37 -0000
@@ -20,7 +20,7 @@
$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
-LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION)
+LIBDIR = $(DESTDIR)/usr/local/lib/pppd/$(VERSION)
install: $(PLUGINS)
$(INSTALL) -d $(LIBDIR)
# make
# make install
cd chat; make BINDIR=/usr/local/sbin MANDIR=/usr/local/man install
make[1]: Entering directory `/usr/local/src/ppp/chat'
mkdir -p /usr/local/sbin
install -s -c chat /usr/local/sbin
install -c -m 644 chat.8 /usr/local/man/man8
make[1]: Leaving directory `/usr/local/src/ppp/chat'
cd pppd/plugins; make BINDIR=/usr/local/sbin MANDIR=/usr/local/man install
make[1]: Entering directory `/usr/local/src/ppp/pppd/plugins'
install -o root -d /usr/local/lib/pppd/2.4.2b2
install -o root minconn.so passprompt.so passwordfd.so /usr/local/lib/pppd/2.4.2b2
for d in rp-pppoe; do make -w -C $d INSTALL=install -o root \
LIBDIR=/usr/local/lib/pppd/2.4.2b2 install; done
make[2]: Entering directory `/usr/local/src/ppp/pppd/plugins/rp-pppoe'
install -d -m 755 /usr/local/lib/pppd/2.4.2b2
install -s -c -m 4550 rp-pppoe.so /usr/local/lib/pppd/2.4.2b2
make[2]: Leaving directory `/usr/local/src/ppp/pppd/plugins/rp-pppoe'
make[1]: Leaving directory `/usr/local/src/ppp/pppd/plugins'
cd pppd; make BINDIR=/usr/local/sbin MANDIR=/usr/local/man install
make[1]: Entering directory `/usr/local/src/ppp/pppd'
mkdir -p /usr/local/sbin /usr/local/man
install -o root -s -c -m 555 pppd /usr/local/sbin/pppd
if chgrp pppusers /usr/local/sbin/pppd 2>/dev/null; then \
chmod o-rx,u+s /usr/local/sbin/pppd; fi
install -o root -c -m 444 pppd.8 /usr/local/man/man8
make[1]: Leaving directory `/usr/local/src/ppp/pppd'
cd pppstats; make BINDIR=/usr/local/sbin MANDIR=/usr/local/man install
make[1]: Entering directory `/usr/local/src/ppp/pppstats'
mkdir -p /usr/local/man/man8
install -o root -g daemon -s -c pppstats /usr/local/sbin/pppstats
install -o root -g daemon -c -m 444 pppstats.8 /usr/local/man/man8/pppstats.8
make[1]: Leaving directory `/usr/local/src/ppp/pppstats'
cd pppdump; make BINDIR=/usr/local/sbin MANDIR=/usr/local/man install
make[1]: Entering directory `/usr/local/src/ppp/pppdump'
mkdir -p /usr/local/sbin /usr/local/man/man8
install -s -c pppdump /usr/local/sbin
install -c -m 444 pppdump.8 /usr/local/man/man8
make[1]: Leaving directory `/usr/local/src/ppp/pppdump'
cd pppd; make BINDIR=/usr/local/sbin MANDIR=/usr/local/man INCDIR=/usr/local/include install-devel
make[1]: Entering directory `/usr/local/src/ppp/pppd'
mkdir -p /usr/local/include/pppd
install -o root -c -m 644 ccp.h chap.h ecp.h fsm.h ipcp.h ipxcp.h lcp.h magic.h md5.h patchlevel.h pathnames.h pppd.h upap.h eap.h md4.h chap_ms.h sha1.h pppcrypt.h tdb.h /usr/local/include/pppd
make[1]: Leaving directory `/usr/local/src/ppp/pppd'
# cd linux
# ./kinstall.sh
Notice to the user:
It is perfectly legal for this script to run without making any changes
to your system. This means that the system currently contains the
necessary changes to support this package. Please do not attempt to
force this script to replace any file nor make any patch. If you do so
then it is probable that you are actually putting older, buggier, code
over the newer, fixed, code. Thank you.
Installing into kernel version 2.4.20 in /usr/src/linux
/usr/src/linux/drivers/net/bsd_comp.c is not older than bsd_comp.c, skipping
/usr/src/linux/drivers/net/ppp_deflate.c is not older than ppp_deflate.c, skipping
Could not find source file zlib.c !
Could not find source file zlib.h !
/usr/src/linux/include/linux/if_ppp.h is not older than ../include/linux/if_ppp.h, skipping
Saving old /usr/src/linux/include/linux/if_pppvar.h as if_pppvar.old.h
Installing new /usr/src/linux/include/linux/if_pppvar.h
Saving old /usr/src/linux/include/linux/ppp-comp.h as ppp-comp.old.h
Installing new /usr/src/linux/include/linux/ppp-comp.h
Saving old /usr/src/linux/include/linux/ppp_defs.h as ppp_defs.old.h
Installing new /usr/src/linux/include/linux/ppp_defs.h
Installing new /usr/src/linux/drivers/net/ppp.c
Adding BSD compression module to drivers makefile...(already there--skipping)
Adding Deflate compression module to drivers makefile...(already there--skipping)
Kernel driver files installation done.
# cd mppe
# sh mppeinstall.sh /usr/src/linux
Is this a 2.2 kernel or 2.4 kernel: 2.4
I will now patch the kernel in directory /usr/src/linux
Press ret to continue, CTRL-C to exit:
patching file include/linux/ppp-comp.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n] y
Hunk #1 succeeded at 289 with fuzz 1 (offset 102 lines).
patching file drivers/net/Config.in
Hunk #1 succeeded at 282 (offset 3 lines).
patching file drivers/net/Makefile
Hunk #2 succeeded at 151 (offset 11 lines).
Hunk #3 succeeded at 259 (offset 13 lines).
patching file drivers/net/ppp_generic.c
Hunk #1 succeeded at 1030 (offset 24 lines).
Hunk #2 succeeded at 1050 (offset 24 lines).
Hunk #3 FAILED at 1558.
1 out of 3 hunks FAILED -- saving rejects to file drivers/net/ppp_generic.c.rej
`/usr/local/src/ppp/linux/mppe/sha1.c' -> `drivers/net/sha1.c'
`/usr/local/src/ppp/linux/mppe/sha1.h' -> `drivers/net/sha1.h'
`/usr/local/src/ppp/linux/mppe/arcfour.c' -> `drivers/net/arcfour.c'
`/usr/local/src/ppp/linux/mppe/arcfour.h' -> `drivers/net/arcfour.h'
`/usr/local/src/ppp/linux/mppe/ppp_mppe_compress.c' -> `drivers/net/ppp_mppe_compress.c'
ppp-2.4.2b3(CVS)と kernel-source-2.4.18-9の場合
# ./kinstall.sh Notice to the user: It is perfectly legal for this script to run without making any changes to your system. This means that the system currently contains the necessary changes to support this package. Please do not attempt to force this script to replace any file nor make any patch. If you do so then it is probable that you are actually putting older, buggier, code over the newer, fixed, code. Thank you. Installing into kernel version 2.4.18 in /usr/src/linux /usr/src/linux/drivers/net/bsd_comp.c is not older than bsd_comp.c, skipping /usr/src/linux/drivers/net/ppp_deflate.c is not older than ppp_deflate.c, skipping Could not find source file zlib.c ! Could not find source file zlib.h ! /usr/src/linux/include/linux/if_ppp.h is not older than ../include/linux/if_ppp.h, skipping Saving old /usr/src/linux/include/linux/if_pppvar.h as if_pppvar.old.h Installing new /usr/src/linux/include/linux/if_pppvar.h Saving old /usr/src/linux/include/linux/ppp-comp.h as ppp-comp.old.h Installing new /usr/src/linux/include/linux/ppp-comp.h Saving old /usr/src/linux/include/linux/ppp_defs.h as ppp_defs.old.h Installing new /usr/src/linux/include/linux/ppp_defs.h Installing new /usr/src/linux/drivers/net/ppp.c Adding BSD compression module to drivers makefile...(already there--skipping) Adding Deflate compression module to drivers makefile...(already there--skipping) Kernel driver files installation done. # cd mppe # sh ./mppeinstall.sh /usr/src/linux-2.4.18 Detected kernel version 2.4.18 I will now patch the kernel in directory /usr/src/linux-2.4.18 Press ret to continue, CTRL-C to exit: patching file include/linux/ppp-comp.h Reversed (or previously applied) patch detected! Assume -R? [n] y Hunk #1 succeeded at 195 (offset 8 lines). patching file drivers/net/Config.in Hunk #1 succeeded at 277 (offset -2 lines). patching file drivers/net/Makefile Hunk #2 succeeded at 138 (offset -2 lines). Hunk #3 succeeded at 244 (offset -2 lines). patching file drivers/net/ppp_generic.c Hunk #3 succeeded at 533 with fuzz 1. `/usr/local/src/ppp/linux/mppe/sha1.c' -> `drivers/net/sha1.c' `/usr/local/src/ppp/linux/mppe/sha1.h' -> `drivers/net/sha1.h' `/usr/local/src/ppp/linux/mppe/arcfour.c' -> `drivers/net/arcfour.c' `/usr/local/src/ppp/linux/mppe/arcfour.h' -> `drivers/net/arcfour.h' `/usr/local/src/ppp/linux/mppe/ppp_mppe_compress.c' -> `drivers/net/ppp_mppe_compress.c' # cd /usr/src/linux/include/linux # patch < /usr/local/src/ppp/linux/mppe/linux-2.4.18-include.patch patching file ppp-comp.h Hunk #1 succeeded at 195 (offset 8 lines).ppp-2.4.2b3(CVS)と kernel-source-2.4.18-11の場合
# ./kinstall.sh Notice to the user: It is perfectly legal for this script to run without making any changes to your system. This means that the system currently contains the necessary changes to support this package. Please do not attempt to force this script to replace any file nor make any patch. If you do so then it is probable that you are actually putting older, buggier, code over the newer, fixed, code. Thank you. Installing into kernel version 2.4.18 in /usr/src/linux /usr/src/linux/drivers/net/bsd_comp.c is not older than bsd_comp.c, skipping /usr/src/linux/drivers/net/ppp_deflate.c is not older than ppp_deflate.c, skipping Could not find source file zlib.c ! Could not find source file zlib.h ! /usr/src/linux/include/linux/if_ppp.h is not older than ../include/linux/if_ppp.h, skipping Saving old /usr/src/linux/include/linux/if_pppvar.h as if_pppvar.old.h Installing new /usr/src/linux/include/linux/if_pppvar.h Saving old /usr/src/linux/include/linux/ppp-comp.h as ppp-comp.old.h Installing new /usr/src/linux/include/linux/ppp-comp.h Saving old /usr/src/linux/include/linux/ppp_defs.h as ppp_defs.old.h Installing new /usr/src/linux/include/linux/ppp_defs.h Installing new /usr/src/linux/drivers/net/ppp.c Adding BSD compression module to drivers makefile...(already there--skipping) Adding Deflate compression module to drivers makefile...(already there--skipping) Kernel driver files installation done. # cd mppe # sh ./mppeinstall.sh /usr/src/linux-2.4.18 Detected kernel version 2.4.18 I will now patch the kernel in directory /usr/src/linux-2.4.18 Press ret to continue, CTRL-C to exit: patching file include/linux/ppp-comp.h Reversed (or previously applied) patch detected! Assume -R? [n] y Hunk #1 succeeded at 195 (offset 8 lines). patching file drivers/net/Config.in Hunk #1 succeeded at 277 (offset -2 lines). patching file drivers/net/Makefile Hunk #2 succeeded at 138 (offset -2 lines). Hunk #3 succeeded at 244 (offset -2 lines). patching file drivers/net/ppp_generic.c Hunk #3 succeeded at 533 with fuzz 1. `/usr/local/src/ppp/linux/mppe/sha1.c' -> `drivers/net/sha1.c' `/usr/local/src/ppp/linux/mppe/sha1.h' -> `drivers/net/sha1.h' `/usr/local/src/ppp/linux/mppe/arcfour.c' -> `drivers/net/arcfour.c' `/usr/local/src/ppp/linux/mppe/arcfour.h' -> `drivers/net/arcfour.h' `/usr/local/src/ppp/linux/mppe/ppp_mppe_compress.c' -> `drivers/net/ppp_mppe_compress.c' # cd /usr/src/linux/include/linux/ # patch < /usr/local/src/ppp/linux/mppe/linux-2.4.18-include.patch patching file ppp-comp.h Hunk #1 succeeded at 195 (offset 8 lines).
カーネル再構築
# cd /usr/src/linux # make menuconfig # make-kpkg clean # make-kpkg --revision=custom.1.0 kernel_image
