Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/pppd
@ 2006-11-17 12:14 aldot at uclibc.org
  0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2006-11-17 12:14 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-11-17 04:14:31 -0800 (Fri, 17 Nov 2006)
New Revision: 16559

Log:
- bump version and pass the target cflags in properly (at least for most of the
  tools. Needs fixing upstream).


Modified:
   trunk/buildroot/package/pppd/pppd.mk


Changeset:
Modified: trunk/buildroot/package/pppd/pppd.mk
===================================================================
--- trunk/buildroot/package/pppd/pppd.mk	2006-11-17 11:54:45 UTC (rev 16558)
+++ trunk/buildroot/package/pppd/pppd.mk	2006-11-17 12:14:31 UTC (rev 16559)
@@ -3,9 +3,10 @@
 # pppd
 #
 #############################################################
-PPPD_SOURCE:=ppp-2.4.3.tar.gz
+PPPD_VERSION:=2.4.4
+PPPD_SOURCE:=ppp-$(PPPD_VERSION).tar.gz
 PPPD_SITE:=ftp://ftp.samba.org/pub/ppp
-PPPD_DIR:=$(BUILD_DIR)/ppp-2.4.3
+PPPD_DIR:=$(BUILD_DIR)/ppp-$(PPPD_VERSION)
 PPPD_CAT:=$(ZCAT)
 PPPD_BINARY:=pppd/pppd
 PPPD_TARGET_BINARY:=usr/sbin/pppd
@@ -49,7 +50,7 @@
 	touch $(PPPD_DIR)/.configured
 
 $(PPPD_DIR)/$(PPPD_BINARY): $(PPPD_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(PPPD_DIR)
+	$(MAKE) CC=$(TARGET_CC) COPTS="$(TARGET_CFLAGS)" -C $(PPPD_DIR)
 
 $(TARGET_DIR)/$(PPPD_TARGET_BINARY): $(PPPD_DIR)/$(PPPD_BINARY)
 	$(MAKE1) DESTDIR=$(TARGET_DIR)/usr CC=$(TARGET_CC) -C $(PPPD_DIR) install

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pppd
@ 2007-08-28 18:22 ulf at uclibc.org
  2007-08-28 21:10 ` Bernhard Fischer
  0 siblings, 1 reply; 8+ messages in thread
From: ulf at uclibc.org @ 2007-08-28 18:22 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-28 11:22:38 -0700 (Tue, 28 Aug 2007)
New Revision: 19715

Log:
This fixes make clean on pppd package (there is no rule uninstall in pppd's makefile) 
and does some small bits of cleanup.

Signed-off-by: Thiago A. Corr?\195?\170a <thiago.correa@gmail.com>


Modified:
   trunk/buildroot/package/pppd/pppd.mk


Changeset:
Modified: trunk/buildroot/package/pppd/pppd.mk
===================================================================
--- trunk/buildroot/package/pppd/pppd.mk	2007-08-28 18:21:00 UTC (rev 19714)
+++ trunk/buildroot/package/pppd/pppd.mk	2007-08-28 18:22:38 UTC (rev 19715)
@@ -26,7 +26,7 @@
 	$(SED) 's,(INSTALL) -s,(INSTALL),' $(PPPD_DIR)/pppd/plugins/*/Makefile.linux
 	$(SED) 's/ -o root//' $(PPPD_DIR)/*/Makefile.linux
 	$(SED) 's/ -g daemon//' $(PPPD_DIR)/*/Makefile.linux
-	touch $(PPPD_DIR)/.unpacked
+	touch $@
 
 $(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked
 	(cd $(PPPD_DIR); rm -rf config.cache; \
@@ -49,7 +49,7 @@
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 	)
-	touch $(PPPD_DIR)/.configured
+	touch $@
 
 $(PPPD_DIR)/$(PPPD_BINARY): $(PPPD_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) COPTS="$(TARGET_CFLAGS)" -C $(PPPD_DIR)
@@ -65,7 +65,6 @@
 	rm -f $(TARGET_DIR)/usr/sbin/pppd
 	rm -f $(TARGET_DIR)/usr/sbin/chat
 	rm -rf $(TARGET_DIR)/etc/ppp
-	$(MAKE) DESTDIR=$(TARGET_DIR)/usr CC=$(TARGET_CC) -C $(PPPD_DIR) uninstall
 	-$(MAKE) -C $(PPPD_DIR) clean
 
 pppd-dirclean:

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pppd
@ 2007-08-28 22:46 ulf at uclibc.org
  0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-08-28 22:46 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-08-28 15:46:54 -0700 (Tue, 28 Aug 2007)
New Revision: 19726

Log:
Remove some more file during pppd-clean

Modified:
   trunk/buildroot/package/pppd/pppd.mk


Changeset:
Modified: trunk/buildroot/package/pppd/pppd.mk
===================================================================
--- trunk/buildroot/package/pppd/pppd.mk	2007-08-28 22:23:08 UTC (rev 19725)
+++ trunk/buildroot/package/pppd/pppd.mk	2007-08-28 22:46:54 UTC (rev 19726)
@@ -64,6 +64,8 @@
 pppd-clean:
 	rm -f $(TARGET_DIR)/usr/sbin/pppd
 	rm -f $(TARGET_DIR)/usr/sbin/chat
+	rm -f $(TARGET_DIR)/usr/sbin/pppstatus
+	rm -f $(TARGET_DIR)/usr/sbin/pppdump
 	rm -rf $(TARGET_DIR)/etc/ppp
 	-$(MAKE) -C $(PPPD_DIR) clean
 

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pppd
@ 2007-09-19 18:07 aldot at uclibc.org
  0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2007-09-19 18:07 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-09-19 11:07:58 -0700 (Wed, 19 Sep 2007)
New Revision: 19895

Log:
- take MANPAGES and INFOPAGES into account


Modified:
   trunk/buildroot/package/pppd/pppd.mk


Changeset:
Modified: trunk/buildroot/package/pppd/pppd.mk
===================================================================
--- trunk/buildroot/package/pppd/pppd.mk	2007-09-19 17:32:21 UTC (rev 19894)
+++ trunk/buildroot/package/pppd/pppd.mk	2007-09-19 18:07:58 UTC (rev 19895)
@@ -56,8 +56,17 @@
 
 $(TARGET_DIR)/$(PPPD_TARGET_BINARY): $(PPPD_DIR)/$(PPPD_BINARY)
 	$(MAKE1) DESTDIR=$(TARGET_DIR)/usr CC=$(TARGET_CC) -C $(PPPD_DIR) install
-	rm -rf $(TARGET_DIR)/usr/share/locale $(TARGET_DIR)/usr/info \
-		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+ifneq ($(BR2_ENABLE_LOCALE),y)
+	rm -rf $(TARGET_DIR)/usr/share/locale
+endif
+ifneq ($(BR2_HAVE_MANPAGES),y)
+	rm -rf $(TARGET_DIR)/usr/share/man
+endif
+ifneq ($(BR2_HAVE_INFOPAGES),y)
+	rm -rf $(TARGET_DIR)/usr/info
+endif
+	rm -rf $(TARGET_DIR)/usr/share/doc
+	rm -rf $(TARGET_DIR)/usr/include/pppd
 
 pppd: uclibc $(TARGET_DIR)/$(PPPD_TARGET_BINARY)
 
@@ -67,6 +76,7 @@
 	rm -f $(TARGET_DIR)/usr/sbin/pppstatus
 	rm -f $(TARGET_DIR)/usr/sbin/pppdump
 	rm -rf $(TARGET_DIR)/etc/ppp
+	rm -rf $(TARGET_DIR)/usr/include/pppd
 	-$(MAKE) -C $(PPPD_DIR) clean
 
 pppd-dirclean:

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pppd
@ 2009-02-19  5:31 hamish at uclibc.org
  0 siblings, 0 replies; 8+ messages in thread
From: hamish at uclibc.org @ 2009-02-19  5:31 UTC (permalink / raw)
  To: buildroot

Author: hamish
Date: 2009-02-19 05:31:05 +0000 (Thu, 19 Feb 2009)
New Revision: 25378

Log:
Enable multilink PPP (no reason to disable it)
Add configuration item to enable filtering (requires libpcap)


Modified:
   trunk/buildroot/package/pppd/Config.in
   trunk/buildroot/package/pppd/pppd.mk


Changeset:
Modified: trunk/buildroot/package/pppd/Config.in
===================================================================
--- trunk/buildroot/package/pppd/Config.in	2009-02-19 01:25:42 UTC (rev 25377)
+++ trunk/buildroot/package/pppd/Config.in	2009-02-19 05:31:05 UTC (rev 25378)
@@ -4,3 +4,13 @@
 	  An implementation of the Point-to-point protocol.
 
 	  http://www.samba.org/ppp/
+
+config BR2_PACKAGE_PPPD_FILTER
+	depends on BR2_PACKAGE_PPPD
+	select BR2_PACKAGE_LIBPCAP
+	bool "filtering"
+	help
+	  Packet filtering abilities for pppd. If enabled,
+	  the pppd active-filter and pass-filter options
+	  are available.
+

Modified: trunk/buildroot/package/pppd/pppd.mk
===================================================================
--- trunk/buildroot/package/pppd/pppd.mk	2009-02-19 01:25:42 UTC (rev 25377)
+++ trunk/buildroot/package/pppd/pppd.mk	2009-02-19 05:31:05 UTC (rev 25378)
@@ -17,15 +17,17 @@
 
 pppd-source: $(DL_DIR)/$(PPPD_SOURCE)
 
+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) -
 	$(SED) 's/ -DIPX_CHANGE -DHAVE_MMAP//' $(PPPD_DIR)/pppd/Makefile.linux
-	$(SED) 's/HAVE_MULTILINK=y/#HAVE_MULTILINK=y/' $(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
 	$(SED) 's,(INSTALL) -s,(INSTALL),' $(PPPD_DIR)/pppd/plugins/*/Makefile.linux
 	$(SED) 's/ -o root//' $(PPPD_DIR)/*/Makefile.linux
 	$(SED) 's/ -g daemon//' $(PPPD_DIR)/*/Makefile.linux
+	$(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
 	touch $@
 
 $(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked
@@ -52,10 +54,10 @@
 	touch $@
 
 $(PPPD_DIR)/$(PPPD_BINARY): $(PPPD_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) COPTS="$(TARGET_CFLAGS)" -C $(PPPD_DIR)
+	$(MAKE) CC=$(TARGET_CC) COPTS="$(TARGET_CFLAGS)" -C $(PPPD_DIR) $(PPPD_OPTIONS_y)
 
 $(TARGET_DIR)/$(PPPD_TARGET_BINARY): $(PPPD_DIR)/$(PPPD_BINARY)
-	$(MAKE1) DESTDIR=$(TARGET_DIR)/usr CC=$(TARGET_CC) -C $(PPPD_DIR) install
+	$(MAKE1) DESTDIR=$(TARGET_DIR)/usr CC=$(TARGET_CC) -C $(PPPD_DIR) install $(PPPD_OPTIONS_y)
 ifneq ($(BR2_ENABLE_LOCALE),y)
 	rm -rf $(TARGET_DIR)/usr/share/locale
 endif

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/pppd
@ 2009-02-19 12:08 jacmet at uclibc.org
  0 siblings, 0 replies; 8+ messages in thread
From: jacmet at uclibc.org @ 2009-02-19 12:08 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2009-02-19 12:08:11 +0000 (Thu, 19 Feb 2009)
New Revision: 25386

Log:
pppd: fix build without UCLIBC_HAS_BSD_ERR

Replace the BSD specific warn() with a call to syslog.
Patch by Gustavo Zacarias, closes #109.

Added:
   trunk/buildroot/package/pppd/pppd-2.4.4-nobsd.patch

Modified:
   trunk/buildroot/package/pppd/pppd.mk


Changeset:
Added: trunk/buildroot/package/pppd/pppd-2.4.4-nobsd.patch
===================================================================
--- trunk/buildroot/package/pppd/pppd-2.4.4-nobsd.patch	                        (rev 0)
+++ trunk/buildroot/package/pppd/pppd-2.4.4-nobsd.patch	2009-02-19 12:08:11 UTC (rev 25386)
@@ -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;

Modified: trunk/buildroot/package/pppd/pppd.mk
===================================================================
--- trunk/buildroot/package/pppd/pppd.mk	2009-02-19 10:28:36 UTC (rev 25385)
+++ trunk/buildroot/package/pppd/pppd.mk	2009-02-19 12:08:11 UTC (rev 25386)
@@ -21,6 +21,7 @@
 
 $(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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2009-02-19 12:08 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-17 12:14 [Buildroot] svn commit: trunk/buildroot/package/pppd aldot at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2007-08-28 18:22 ulf at uclibc.org
2007-08-28 21:10 ` Bernhard Fischer
2007-08-28 21:59   ` Cristian Ionescu-Idbohrn
2007-08-28 22:46 ulf at uclibc.org
2007-09-19 18:07 aldot at uclibc.org
2009-02-19  5:31 hamish at uclibc.org
2009-02-19 12:08 jacmet at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox