--912357424-1626131994-870211347=:2333
Content-Type: TEXT/PLAIN; charset=US-ASCII
Since installing glibc 2.0.3, I had trouble compiling any of the recent
versions of the ppp package under Linux. I made a few changes to
ppp-2.3.1 and the headers from Linux 2.0.30 which yield a working pppd,
and I offer them here.
- with glibc 2, <termbits.h> needs to be included in pppd/sys-linux.c.
- in that same file, I had to include <linux/ppp_defs.h> at a different
point from where it was originally.
- there was a ^L in that same file which seemed to be causing problems.
- from that same file, <socketbits.h> was getting included along with
<linux/socket.h> and <linux/if.h>, causing many things (constants
for address and protocol families, and structs) to be redefined.
I changed the kernel headers so those are only defined if _SOCKETBITS_H
(defined, unsurprisingly, in <socketbits.h>) had not been defined.
This also seems to pertain to ppp-2.2.0f, ppp-2.2.0g, ppp-2.3.0, and
linux-pre-2.1.45-1. I don't know whether these changes are the right
thing, but they are working for me.
___
Trevor Johnson
--912357424-1626131994-870211347=:2333
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="ppp-2.3.1-glibc.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.3.96.970729142227.2333A@topside.fake.net>
Content-Description: ppp-2.3.1-glibc.diff
ZGlmZiAtdSAtciBwcHAtMi4zLjEvcHBwZC9zeXMtbGludXguYyBwcHAtMi4z
LjEtZ2xpYmMvcHBwZC9zeXMtbGludXguYw0KLS0tIHBwcC0yLjMuMS9wcHBk
L3N5cy1saW51eC5jCUZyaSBKdW4gMjcgMDU6MDU6MTIgMTk5Nw0KKysrIHBw
cC0yLjMuMS1nbGliYy9wcHBkL3N5cy1saW51eC5jCVR1ZSBKdWwgMjkgMDM6
NDI6MDIgMTk5Nw0KQEAgLTM3LDYgKzM3LDcgQEANCiAjaW5jbHVkZSA8c2ln
bmFsLmg+DQogI2luY2x1ZGUgPGZjbnRsLmg+DQogI2luY2x1ZGUgPGN0eXBl
Lmg+DQorI2luY2x1ZGUgPHRlcm1iaXRzLmg+DQogDQogLyogVGhpcyBpcyBp
biBuZXRkZXZpY2UuaC4gSG93ZXZlciwgdGhpcyBjb21waWxlIHdpbGwgZmFp
bCBtaXNlcmFibHkgaWYNCiAgICB5b3UgYXR0ZW1wdCB0byBpbmNsdWRlIG5l
dGRldmljZS5oIGJlY2F1c2UgaXQgaGFzIHNvIG1hbnkgcmVmZXJlbmNlcw0K
QEAgLTQ5LDEyICs1MCwxMiBAQA0KIA0KICNpbmNsdWRlIDxsaW51eC92ZXJz
aW9uLmg+DQogI2luY2x1ZGUgPG5ldC9pZi5oPg0KLSNpbmNsdWRlIDxsaW51
eC9wcHBfZGVmcy5oPg0KICNpbmNsdWRlIDxuZXQvaWZfYXJwLmg+DQogI2lu
Y2x1ZGUgPGxpbnV4L2lmX3BwcC5oPg0KICNpbmNsdWRlIDxuZXQvcm91dGUu
aD4NCiAjaW5jbHVkZSA8bGludXgvaWZfZXRoZXIuaD4NCiAjaW5jbHVkZSA8
bmV0aW5ldC9pbi5oPg0KKyNpbmNsdWRlIDxsaW51eC9wcHBfZGVmcy5oPg0K
IA0KICNpbmNsdWRlICJwcHBkLmgiDQogI2luY2x1ZGUgImZzbS5oIg0KQEAg
LTI0MjAsNyArMjQyMSw2IEBADQogICAgIHJldHVybiAxOw0KICAgfQ0KIA0K
LQwNCiAjaW5jbHVkZSA8bGludXgvaXB4Lmg+DQogDQogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqDQo=
--912357424-1626131994-870211347=:2333
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="linux-2.0.30-glibc.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.3.96.970729142227.2333B@topside.fake.net>
Content-Description: linux-2.0.30-glibc.diff
ZGlmZiAtdSAtciBsaW51eC9pbmNsdWRlL2xpbnV4L2lmLmggbGludXgtMi4w
LjMwLWdsaWJjL2luY2x1ZGUvbGludXgvaWYuaA0KLS0tIGxpbnV4L2luY2x1
ZGUvbGludXgvaWYuaAlUdWUgT2N0ICA4IDA5OjQ1OjI4IDE5OTYNCisrKyBs
aW51eC0yLjAuMzAtZ2xpYmMvaW5jbHVkZS9saW51eC9pZi5oCVR1ZSBKdWwg
MjkgMTM6MDg6MjkgMTk5Nw0KQEAgLTQ4LDYgKzQ4LDcgQEANCiAgKiBiZSBs
b2NhdGVkLg0KICAqLw0KICANCisjaWZuZGVmIF9TT0NLRVRCSVRTX0gNCiBz
dHJ1Y3QgaWZhZGRyIA0KIHsNCiAJc3RydWN0IHNvY2thZGRyCWlmYV9hZGRy
OwkvKiBhZGRyZXNzIG9mIGludGVyZmFjZQkJKi8NCkBAIC01OCw2ICs1OSw3
IEBADQogCXN0cnVjdCBpZmFjZQkJKmlmYV9pZnA7CS8qIGJhY2stcG9pbnRl
ciB0byBpbnRlcmZhY2UJKi8NCiAJc3RydWN0IGlmYWRkcgkJKmlmYV9uZXh0
OwkvKiBuZXh0IGFkZHJlc3MgZm9yIGludGVyZmFjZQkqLw0KIH07DQorI2Vu
ZGlmDQogDQogI2RlZmluZQlpZmFfYnJvYWRhZGRyCWlmYV9pZnUuaWZ1X2Jy
b2FkYWRkcgkvKiBicm9hZGNhc3QgYWRkcmVzcwkqLw0KICNkZWZpbmUJaWZh
X2RzdGFkZHIJaWZhX2lmdS5pZnVfZHN0YWRkcgkvKiBvdGhlciBlbmQgb2Yg
bGluawkqLw0KQEAgLTcyLDYgKzc0LDcgQEANCiAgKgliZWluZyB2ZXJ5IHNt
YWxsIG1pZ2h0IGJlIHdvcnRoIGtlZXBpbmcgZm9yIGNsZWFuIGNvbmZpZ3Vy
YXRpb24uDQogICovDQogDQorI2lmbmRlZiBfU09DS0VUQklUU19IDQogc3Ry
dWN0IGlmbWFwIA0KIHsNCiAJdW5zaWduZWQgbG9uZyBtZW1fc3RhcnQ7DQpA
QCAtMTEzLDYgKzExNiw3IEBADQogCQljYWRkcl90CWlmcnVfZGF0YTsNCiAJ
fSBpZnJfaWZydTsNCiB9Ow0KKyNlbmRpZg0KIA0KICNkZWZpbmUgaWZyX25h
bWUJaWZyX2lmcm4uaWZybl9uYW1lCS8qIGludGVyZmFjZSBuYW1lIAkqLw0K
ICNkZWZpbmUgaWZyX2h3YWRkcglpZnJfaWZydS5pZnJ1X2h3YWRkcgkvKiBN
QUMgYWRkcmVzcyAJCSovDQpAQCAtMTIxLDcgKzEyNSw5IEBADQogI2RlZmlu
ZQlpZnJfYnJvYWRhZGRyCWlmcl9pZnJ1LmlmcnVfYnJvYWRhZGRyCS8qIGJy
b2FkY2FzdCBhZGRyZXNzCSovDQogI2RlZmluZQlpZnJfbmV0bWFzawlpZnJf
aWZydS5pZnJ1X25ldG1hc2sJLyogaW50ZXJmYWNlIG5ldCBtYXNrCSovDQog
I2RlZmluZQlpZnJfZmxhZ3MJaWZyX2lmcnUuaWZydV9mbGFncwkvKiBmbGFn
cwkJKi8NCisjaWZuZGVmIGlmcl9tZXRyaWMNCiAjZGVmaW5lCWlmcl9tZXRy
aWMJaWZyX2lmcnUuaWZydV9tZXRyaWMJLyogbWV0cmljCQkqLw0KKyNlbmRp
Zg0KICNkZWZpbmUJaWZyX210dQkJaWZyX2lmcnUuaWZydV9tdHUJLyogbXR1
CQkJKi8NCiAjZGVmaW5lIGlmcl9tYXAJCWlmcl9pZnJ1LmlmcnVfbWFwCS8q
IGRldmljZSBtYXAJCSovDQogI2RlZmluZSBpZnJfc2xhdmUJaWZyX2lmcnUu
aWZydV9zbGF2ZQkvKiBzbGF2ZSBkZXZpY2UJCSovDQpAQCAtMTM0LDYgKzE0
MCw3IEBADQogICogbXVzdCBrbm93IGFsbCBuZXR3b3JrcyBhY2Nlc3NpYmxl
KS4NCiAgKi8NCiANCisjaWZuZGVmIF9TT0NLRVRCSVRTX0gNCiBzdHJ1Y3Qg
aWZjb25mIA0KIHsNCiAJaW50CWlmY19sZW47CQkJLyogc2l6ZSBvZiBidWZm
ZXIJKi8NCkBAIC0xNDMsNiArMTUwLDcgQEANCiAJCXN0cnVjdAlpZnJlcSAq
aWZjdV9yZXE7DQogCX0gaWZjX2lmY3U7DQogfTsNCisjZW5kaWYNCiAjZGVm
aW5lCWlmY19idWYJaWZjX2lmY3UuaWZjdV9idWYJCS8qIGJ1ZmZlciBhZGRy
ZXNzCSovDQogI2RlZmluZQlpZmNfcmVxCWlmY19pZmN1LmlmY3VfcmVxCQkv
KiBhcnJheSBvZiBzdHJ1Y3R1cmVzCSovDQogDQpkaWZmIC11IC1yIGxpbnV4
L2luY2x1ZGUvbGludXgvc29ja2V0LmggbGludXgtMi4wLjMwLWdsaWJjL2lu
Y2x1ZGUvbGludXgvc29ja2V0LmgNCi0tLSBsaW51eC9pbmNsdWRlL2xpbnV4
L3NvY2tldC5oCVR1ZSBBcHIgMjIgMDg6NTY6MTkgMTk5Nw0KKysrIGxpbnV4
LTIuMC4zMC1nbGliYy9pbmNsdWRlL2xpbnV4L3NvY2tldC5oCVR1ZSBKdWwg
MjkgMTM6MDY6MzQgMTk5Nw0KQEAgLTUsNiArNSw3IEBADQogI2luY2x1ZGUg
PGxpbnV4L3NvY2tpb3MuaD4JCS8qIHRoZSBTSU9DeHh4IEkvTyBjb250cm9s
cwkqLw0KICNpbmNsdWRlIDxsaW51eC91aW8uaD4JCQkvKiBpb3ZlYyBzdXBw
b3J0CQkqLw0KIA0KKyNpZm5kZWYgX1NPQ0tFVEJJVFNfSA0KIHN0cnVjdCBz
b2NrYWRkciANCiB7DQogCXVuc2lnbmVkIHNob3J0CXNhX2ZhbWlseTsJLyog
YWRkcmVzcyBmYW1pbHksIEFGX3h4eAkqLw0KQEAgLTMyLDEyICszMywxNCBA
QA0KIAlpbnQJCW1zZ19jb250cm9sbGVuOwkvKiBMZW5ndGggb2YgcmlnaHRz
IGxpc3QgKi8NCiAJaW50CQltc2dfZmxhZ3M7CS8qIDQuNCBCU0QgaXRlbSB3
ZSBkb250IHVzZSAgICAgICovDQogfTsNCisjZW5kaWYNCiANCiAvKiBDb250
cm9sIE1lc3NhZ2VzICovDQogDQogI2RlZmluZSBTQ01fUklHSFRTCQkxDQog
DQogLyogU29ja2V0IHR5cGVzLiAqLw0KKyNpZm5kZWYgX1NPQ0tFVEJJVFNf
SA0KICNkZWZpbmUgU09DS19TVFJFQU0JMQkJLyogc3RyZWFtIChjb25uZWN0
aW9uKSBzb2NrZXQJKi8NCiAjZGVmaW5lIFNPQ0tfREdSQU0JMgkJLyogZGF0
YWdyYW0gKGNvbm4ubGVzcykgc29ja2V0CSovDQogI2RlZmluZSBTT0NLX1JB
VwkzCQkvKiByYXcgc29ja2V0CQkJKi8NCkBAIC04MCw2ICs4Myw3IEBADQog
I2RlZmluZSBQRl9JTkVUNglBRl9JTkVUNg0KICNlbmRpZg0KICNkZWZpbmUg
UEZfTUFYCQlBRl9NQVgNCisjZW5kaWYNCiANCiAvKiBNYXhpbXVtIHF1ZXVl
IGxlbmd0aCBzcGVjaWZpYWJsZSBieSBsaXN0ZW4uICAqLw0KICNkZWZpbmUg
U09NQVhDT05OCTEyOA0K
--912357424-1626131994-870211347=:2333--