aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2008-05-03 12:11:35 +0000
committerNicolas Thill <nico@openwrt.org>2008-05-03 12:11:35 +0000
commit3d4052492d762d585aa347a865f5a90eb76e79cf (patch)
tree7a8bb7ab15bdf9f6fe937b1602de4122f8e4ff75 /package
parent21c5ef4c1d5cf43b8055eea98a509412c0ab17c1 (diff)
downloadupstream-3d4052492d762d585aa347a865f5a90eb76e79cf.tar.gz
upstream-3d4052492d762d585aa347a865f5a90eb76e79cf.tar.bz2
upstream-3d4052492d762d585aa347a865f5a90eb76e79cf.zip
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
SVN-Revision: 11018
Diffstat (limited to 'package')
-rw-r--r--package/ppp/Makefile4
-rw-r--r--package/ppp/files/etc/ppp/options1
-rw-r--r--package/pptp/Makefile5
3 files changed, 6 insertions, 4 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index ec52ab71ef..f6dbd33c95 100644
--- 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 d91d068683..35889edc6b 100644
--- 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 2779dbf36f..1576352362 100644
--- 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