[package] ppp/pptp fixes:

 - prevent ppp from logging to /etc/ppp/connect-errors (closes: #2989)
 - add dependency on ppp and kmod-gre to pptp
 - bump release number

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11018 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index ec52ab7..f6dbd33 100644 (file)
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.3
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

diff --git a/package/ppp/files/etc/ppp/options b/package/ppp/files/etc/ppp/options
index d91d068..35889ed 100644 (file)
--- a/package/ppp/files/etc/ppp/options
+++ b/package/ppp/files/etc/ppp/options
@@ -1,4 +1,5 @@
 #debug
+logfile /dev/null
 noaccomp
 nopcomp
 nocrtscts

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 2779dbf..1576352 100644 (file)
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
@@ -23,6 +23,7 @@ define Package/pptp
   CATEGORY:=Network
   TITLE:=PPTP client
   URL:=http://pptpclient.sourceforge.net/
+  DEPENDS:=+ppp +kmod-gre
 endef
 
 define Package/pptp/daemon