diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-02-19 12:08:11 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-02-19 12:08:11 +0000 |
| commit | fc8ac0c7e511db9453105176315cc54574cfc3a7 (patch) | |
| tree | 2c9f2527fc0d859af2124ef29ce8cb9b0d58bd0a | |
| parent | a83dddf9ff22cf160dba9f4ecf21ba7b36d0ba69 (diff) | |
pppd: fix build without UCLIBC_HAS_BSD_ERR
Replace the BSD specific warn() with a call to syslog.
Patch by Gustavo Zacarias, closes #109.
| -rw-r--r-- | package/pppd/pppd-2.4.4-nobsd.patch | 21 | ||||
| -rw-r--r-- | package/pppd/pppd.mk | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/package/pppd/pppd-2.4.4-nobsd.patch b/package/pppd/pppd-2.4.4-nobsd.patch new file mode 100644 index 000000000..7ffc1b5ad --- /dev/null +++ b/package/pppd/pppd-2.4.4-nobsd.patch @@ -0,0 +1,21 @@ +diff -Nura ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c ppp-2.4.4-nobsd/pppd/plugins/rp-pppoe/discovery.c +--- ppp-2.4.4/pppd/plugins/rp-pppoe/discovery.c 2005-03-22 07:22:32.000000000 -0300 ++++ ppp-2.4.4-nobsd/pppd/plugins/rp-pppoe/discovery.c 2009-02-17 09:01:27.000000000 -0200 +@@ -598,7 +598,7 @@ + do { + padiAttempts++; + if (padiAttempts > MAX_PADI_ATTEMPTS) { +- warn("Timeout waiting for PADO packets"); ++ syslog(LOG_WARNING, "Timeout waiting for PADO packets"); + close(conn->discoverySocket); + conn->discoverySocket = -1; + return; +@@ -627,7 +627,7 @@ + do { + padrAttempts++; + if (padrAttempts > MAX_PADI_ATTEMPTS) { +- warn("Timeout waiting for PADS packets"); ++ syslog(LOG_WARNING, "Timeout waiting for PADS packets"); + close(conn->discoverySocket); + conn->discoverySocket = -1; + return; diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 1099cd52b..0c25cd098 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -21,6 +21,7 @@ PPPD_OPTIONS_$(BR2_PACKAGE_PPPD_FILTER) += FILTER=y $(PPPD_DIR)/.unpacked: $(DL_DIR)/$(PPPD_SOURCE) $(PPPD_CAT) $(DL_DIR)/$(PPPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(PPPD_DIR) package/pppd/ pppd\*.patch $(SED) 's/ -DIPX_CHANGE -DHAVE_MMAP//' $(PPPD_DIR)/pppd/Makefile.linux $(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux $(SED) 's,(INSTALL) -s,(INSTALL),' $(PPPD_DIR)/*/Makefile.linux |