Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Achou.Wang
accel-ppp
提交
b98f515d
A
accel-ppp
项目概览
Achou.Wang
/
accel-ppp
通知
6
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
accel-ppp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b98f515d
编写于
1月 08, 2011
作者:
D
Dmitry Kozlov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
updated contrib files
上级
53f22bd8
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
64 addition
and
80 deletion
+64
-80
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/cpack.cmake
cmake/cpack.cmake
+2
-2
cmake/debian/debian.cmake
cmake/debian/debian.cmake
+6
-6
contrib/debian/accel-ppp-default
contrib/debian/accel-ppp-default
+0
-0
contrib/debian/accel-ppp-init
contrib/debian/accel-ppp-init
+14
-14
contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.1.1.ebuild
contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.1.1.ebuild
+20
-20
contrib/gentoo/net-dialup/accel-ppp/accel-ppp-9999.ebuild
contrib/gentoo/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+20
-16
contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd
contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd
+1
-1
contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
+0
-20
未找到文件。
CMakeLists.txt
浏览文件 @
b98f515d
...
...
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
cmake_policy
(
SET CMP0005 NEW
)
cmake_policy
(
SET CMP0003 OLD
)
PROJECT
(
accel-pp
t
pd C
)
PROJECT
(
accel-pppd C
)
include
(
cmake/cpack.cmake
)
...
...
cmake/cpack.cmake
浏览文件 @
b98f515d
...
...
@@ -4,9 +4,9 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET
(
CPACK_PACKAGE_VERSION_MINOR
"3"
)
SET
(
CPACK_PACKAGE_VERSION_PATCH
"2"
)
SET
(
CPACK_PACKAGE_NAME
"accel-pp
t
p"
)
SET
(
CPACK_PACKAGE_NAME
"accel-ppp"
)
SET
(
CPACK_PACKAGE_CONTACT
"Dmitry Kozlov <xeb@mail.ru>"
)
SET
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"
High-performance multi-protocol tunneling
server for Linux"
)
SET
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"
PPtP/L2TP/PPPoE
server for Linux"
)
SET
(
CPACK_PACKAGE_VENDOR
"Dmitry Kozlov"
)
SET
(
CPACK_PACKAGE_DESCRIPTION_FILE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/README"
)
...
...
cmake/debian/debian.cmake
浏览文件 @
b98f515d
SET
(
CPACK_PACKAGING_INSTALL_PREFIX
"/usr"
)
SET
(
CPACK_PACKAGE_FILE_NAME
${
CPACK_PACKAGE_NAME
}
)
SET
(
CPACK_PACKAGE_FILE_NAME
${
CPACK_PACKAGE_NAME
}
)
if
(
BUILD_DRIVER_ONLY
)
SET
(
CPACK_PACKAGE_NAME
"accel-pp
t
p-kmod"
)
SET
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"accel-pp
t
p kernel module"
)
SET
(
CPACK_PACKAGE_NAME
"accel-ppp-kmod"
)
SET
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"accel-ppp kernel module"
)
SET
(
CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/debian-kmod/postinst"
)
INSTALL
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/driver/driver/pptp.ko DESTINATION lib/modules/
${
DEBIAN_KDIR
}
/extra
)
#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})")
...
...
@@ -11,7 +11,7 @@ else (BUILD_DRIVER_ONLY)
SET
(
CPACK_DEBIAN_PACKAGE_DEPENDS
"libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 7.6)"
)
SET
(
CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/debian/postinst;
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/debian/conffiles"
)
INSTALL
(
FILES
${
CMAKE_HOME_DIRECTORY
}
/accel-pp
tpd/accel-pptp.conf DESTINATION
${
CMAKE_BINARY_DIR
}
/_CPack_Packages/Linux/DEB/
${
CPACK_PACKAGE_FILE_NAME
}
/etc RENAME accel-ppt
p.conf.dist
)
INSTALL
(
FILES
${
CMAKE_HOME_DIRECTORY
}
/contrib/debian/accel-pp
tp-init DESTINATION
${
CMAKE_BINARY_DIR
}
/_CPack_Packages/Linux/DEB/
${
CPACK_PACKAGE_FILE_NAME
}
/etc/init.d RENAME accel-ppt
p
)
INSTALL
(
FILES
${
CMAKE_HOME_DIRECTORY
}
/contrib/debian/accel-pp
tp-default DESTINATION
${
CMAKE_BINARY_DIR
}
/_CPack_Packages/Linux/DEB/
${
CPACK_PACKAGE_FILE_NAME
}
/etc/default RENAME accel-ppt
p
)
INSTALL
(
FILES
${
CMAKE_HOME_DIRECTORY
}
/accel-pp
pd/accel-ppp.conf DESTINATION
${
CMAKE_BINARY_DIR
}
/_CPack_Packages/Linux/DEB/
${
CPACK_PACKAGE_FILE_NAME
}
/etc RENAME accel-pp
p.conf.dist
)
INSTALL
(
FILES
${
CMAKE_HOME_DIRECTORY
}
/contrib/debian/accel-pp
p-init DESTINATION
${
CMAKE_BINARY_DIR
}
/_CPack_Packages/Linux/DEB/
${
CPACK_PACKAGE_FILE_NAME
}
/etc/init.d RENAME accel-pp
p
)
INSTALL
(
FILES
${
CMAKE_HOME_DIRECTORY
}
/contrib/debian/accel-pp
p-default DESTINATION
${
CMAKE_BINARY_DIR
}
/_CPack_Packages/Linux/DEB/
${
CPACK_PACKAGE_FILE_NAME
}
/etc/default RENAME accel-pp
p
)
endif
(
BUILD_DRIVER_ONLY
)
contrib/debian/accel-pp
t
p-default
→
contrib/debian/accel-ppp-default
浏览文件 @
b98f515d
文件已移动
contrib/debian/accel-pp
t
p-init
→
contrib/debian/accel-ppp-init
浏览文件 @
b98f515d
#!/bin/sh
# /etc/init.d/accel-pp
tpd: set up the accel-ppt
p server
# /etc/init.d/accel-pp
pd: set up the accel-pp
p server
### BEGIN INIT INFO
# Provides: accel-pp
t
p
# Provides: accel-ppp
# Required-Start: $networking
# Required-Stop: $networking
# Default-Start: 2 3 4 5
...
...
@@ -14,27 +14,27 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
.
/lib/lsb/init-functions
if
test
-f
/etc/default/accel-pp
t
p
;
then
.
/etc/default/accel-pp
t
p
if
test
-f
/etc/default/accel-ppp
;
then
.
/etc/default/accel-ppp
fi
if
[
-z
$ACCEL_PPP
T
D_OPTS
]
;
then
ACCEL_PP
TPD_OPTS
=
"-c /etc/accel-ppt
p.conf"
if
[
-z
$ACCEL_PPPD_OPTS
]
;
then
ACCEL_PP
PD_OPTS
=
"-c /etc/accel-pp
p.conf"
fi
case
"
$1
"
in
start
)
log_daemon_msg
"Starting
accel-pptp server"
"accel-ppt
pd"
if
start-stop-daemon
--start
--quiet
--oknodo
--exec
/usr/sbin/accel-pp
tpd
--
-d
-p
/var/run/accel-pptpd.pid
$ACCEL_PPT
PD_OPTS
;
then
log_daemon_msg
"Starting
PPtP/L2TP/PPPoE server"
"accel-pp
pd"
if
start-stop-daemon
--start
--quiet
--oknodo
--exec
/usr/sbin/accel-pp
pd
--
-d
-p
/var/run/accel-pppd.pid
$ACCEL_PP
PD_OPTS
;
then
log_end_msg 0
else
log_end_msg 1
fi
;;
restart
)
log_daemon_msg
"Restarting
accel-pptp server"
"accel-ppt
pd"
start-stop-daemon
--stop
--quiet
--oknodo
--retry
180
--pidfile
/var/run/accel-pp
t
pd.pid
if
start-stop-daemon
--start
--quiet
--oknodo
--exec
/usr/sbin/accel-pp
tpd
--
-d
-p
/var/run/accel-pptpd.pid
$ACCEL_PPT
PD_OPTS
;
then
log_daemon_msg
"Restarting
PPtP/L2TP/PPPoE server"
"accel-pp
pd"
start-stop-daemon
--stop
--quiet
--oknodo
--retry
180
--pidfile
/var/run/accel-pppd.pid
if
start-stop-daemon
--start
--quiet
--oknodo
--exec
/usr/sbin/accel-pp
pd
--
-d
-p
/var/run/accel-pppd.pid
$ACCEL_PP
PD_OPTS
;
then
log_end_msg 0
else
log_end_msg 1
...
...
@@ -42,8 +42,8 @@ case "$1" in
;;
stop
)
log_daemon_msg
"Stopping
accel-pptp server"
"accel-ppt
pd"
start-stop-daemon
--stop
--quiet
--oknodo
--retry
180
--pidfile
/var/run/accel-pp
t
pd.pid
log_daemon_msg
"Stopping
PPtP/L2TP/PPPoE server"
"accel-pp
pd"
start-stop-daemon
--stop
--quiet
--oknodo
--retry
180
--pidfile
/var/run/accel-pppd.pid
log_end_msg 0
;;
...
...
@@ -51,7 +51,7 @@ case "$1" in
do_status
;;
*
)
log_success_msg
"Usage: /etc/init.d/accel-pp
t
p {start|stop|status|restart}"
log_success_msg
"Usage: /etc/init.d/accel-ppp {start|stop|status|restart}"
exit
1
;;
esac
...
...
contrib/gentoo/net-dialup/accel-pp
tp/accel-ppt
p-1.1.1.ebuild
→
contrib/gentoo/net-dialup/accel-pp
p/accel-pp
p-1.1.1.ebuild
浏览文件 @
b98f515d
...
...
@@ -5,24 +5,23 @@ EAPI=2
inherit eutils linux-mod cmake-utils
DESCRIPTION
=
"P
oint-to-Point Tunnelling Protocol Client/S
erver for Linux"
SRC_URI
=
"http://sourceforge.net/projects/accel-pp
tp/files/accel-ppt
p/
${
P
}
.tar.bz2"
HOMEPAGE
=
"http://accel-pp
t
p.sourceforge.net/"
DESCRIPTION
=
"P
PtP/L2TP/PPPoE s
erver for Linux"
SRC_URI
=
"http://sourceforge.net/projects/accel-pp
p/files/accel-pp
p/
${
P
}
.tar.bz2"
HOMEPAGE
=
"http://accel-ppp.sourceforge.net/"
SLOT
=
"0"
LICENSE
=
"GPL"
KEYWORDS
=
"~amd64 ~x86"
IUSE
=
"postgres debug
l2tp shap
er"
IUSE
=
"postgres debug
shaper pptp_driv
er"
DEPEND
=
">=sys-libs/glibc-2.8
dev-libs/openssl
dev-libs/libaio
l2tp? ( =dev-libs/libnl-9999 )
shaper? ( =dev-libs/libnl-9999 )
shaper? ( =dev-libs/libnl-2 )
postgres? ( >=dev-db/postgresql-base-8.1 )"
RDEPEND
=
"
$DEPEND
virtual/modutils
"
pptp_driver? ( virtual/modutils )
"
BUILD_TARGETS
=
"default"
BUILD_PARAMS
=
"KDIR=
${
KERNEL_DIR
}
"
...
...
@@ -32,7 +31,7 @@ PREFIX="/"
MODULE_NAMES
=
"pptp(extra:
${
S
}
/driver/)"
src_prepare
()
{
sed
-i
-e
"/mkdir/d"
"
${
S
}
/accel-pp
t
pd/CMakeLists.txt"
sed
-i
-e
"/mkdir/d"
"
${
S
}
/accel-pppd/CMakeLists.txt"
sed
-i
-e
"/INSTALL/d"
"
${
S
}
/driver/CMakeLists.txt"
}
...
...
@@ -44,10 +43,6 @@ src_configure() {
if
use postgres
;
then
mycmakeargs+
=(
"-DLOG_PGSQL=TRUE"
)
fi
if
use l2tp
;
then
mycmakeargs+
=(
"-DL2TP=TRUE"
)
fi
if
use shaper
;
then
mycmakeargs+
=(
"-DSHAPER=TRUE"
)
...
...
@@ -58,23 +53,28 @@ src_configure() {
src_compile
()
{
cmake-utils_src_compile
cd
${
S
}
/driver
linux-mod_src_compile
||
die
"failed to build driver"
if
use pptp_driver
;
then
cd
${
S
}
/driver
linux-mod_src_compile
||
die
"failed to build driver"
fi
}
src_install
()
{
cmake-utils_src_install
cd
${
S
}
/driver
linux-mod_src_install
if
use pptp_driver
;
then
cd
${
S
}
/driver
linux-mod_src_install
fi
exeinto /etc/init.d
newexe
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
tp/files/pptpd-init"
accel-ppt
pd
newexe
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
p/files/accel-pppd-init"
accel-pp
pd
insinto /etc/conf.d
newins
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
tp/files/pptpd-confd"
accel-ppt
pd
newins
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
p/files/pppd-confd"
accel-pp
pd
dodir /var/log/accel-pptp
dodir /var/log/accel-ppp
dodir /var/run/accel-ppp
dodir /var/run/radattr
}
contrib/gentoo/net-dialup/accel-pp
tp/accel-ppt
p-9999.ebuild
→
contrib/gentoo/net-dialup/accel-pp
p/accel-pp
p-9999.ebuild
浏览文件 @
b98f515d
...
...
@@ -5,16 +5,16 @@ EAPI=2
inherit eutils git linux-mod cmake-utils
EGIT_REPO_URI
=
"git://accel-pp
tp.git.sourceforge.net/gitroot/accel-pptp/accel-ppt
p"
EGIT_REPO_URI
=
"git://accel-pp
p.git.sourceforge.net/gitroot/accel-ppp/accel-pp
p"
DESCRIPTION
=
"P
oint-to-Point Tunnelling Protocol Client/
Server for Linux"
DESCRIPTION
=
"P
PtP/L2TP/PPPoE
Server for Linux"
SRC_URI
=
""
HOMEPAGE
=
"http://accel-pp
t
p.sourceforge.net/"
HOMEPAGE
=
"http://accel-ppp.sourceforge.net/"
SLOT
=
"0"
LICENSE
=
"GPL"
KEYWORDS
=
"~amd64 ~x86"
IUSE
=
"postgres debug shaper"
IUSE
=
"postgres debug shaper
pptp_driver
"
DEPEND
=
">=sys-libs/glibc-2.8
dev-libs/openssl
...
...
@@ -23,7 +23,7 @@ DEPEND=">=sys-libs/glibc-2.8
postgres? ( >=dev-db/postgresql-base-8.1 )"
RDEPEND
=
"
$DEPEND
virtual/modutils
"
pptp_driver? ( virtual/modutils )
"
BUILD_TARGETS
=
"default"
BUILD_PARAMS
=
"KDIR=
${
KERNEL_DIR
}
"
...
...
@@ -37,8 +37,8 @@ src_unpack () {
}
src_prepare
()
{
sed
-i
-e
"/mkdir/d"
"
${
S
}
/accel-pp
t
pd/CMakeLists.txt"
sed
-i
-e
"/echo/d"
"
${
S
}
/accel-pp
t
pd/CMakeLists.txt"
sed
-i
-e
"/mkdir/d"
"
${
S
}
/accel-pppd/CMakeLists.txt"
sed
-i
-e
"/echo/d"
"
${
S
}
/accel-pppd/CMakeLists.txt"
sed
-i
-e
"/INSTALL/d"
"
${
S
}
/driver/CMakeLists.txt"
}
...
...
@@ -61,24 +61,28 @@ src_configure() {
src_compile
()
{
cmake-utils_src_compile
cd
${
S
}
/driver
#convert_to_m Makefile
linux-mod_src_compile
||
die
"failed to build driver"
if
use pptp_driver
;
then
cd
${
S
}
/driver
#convert_to_m Makefile
linux-mod_src_compile
||
die
"failed to build driver"
fi
}
src_install
()
{
cmake-utils_src_install
cd
${
S
}
/driver
linux-mod_src_install
if
use pptp_driver
;
then
cd
${
S
}
/driver
linux-mod_src_install
fi
exeinto /etc/init.d
newexe
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
tp/files/pptpd-init"
accel-ppt
pd
newexe
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
p/files/accel-pppd-init"
accel-pp
pd
insinto /etc/conf.d
newins
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
tp/files/pptpd-confd"
accel-ppt
pd
newins
"
${
S
}
/contrib/gentoo/net-dialup/accel-pp
p/files/accel-pppd-confd"
accel-pp
pd
dodir /var/log/accel-pp
t
p
dodir /var/run/accel-pp
t
p
dodir /var/log/accel-ppp
dodir /var/run/accel-ppp
dodir /var/run/radattr
}
contrib/gentoo/net-dialup/accel-pp
tp/files/ppt
pd-confd
→
contrib/gentoo/net-dialup/accel-pp
p/files/accel-pp
pd-confd
浏览文件 @
b98f515d
...
...
@@ -2,4 +2,4 @@
# Any extra options you want to pass to pptpd
# on start-up should be put here.
PPTPD_OPTS="-d -c /etc/accel-ppt
p.conf"
ACCEL_PPPD_OPTS="-d -c /etc/accel-pp
p.conf"
contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
已删除
100755 → 0
浏览文件 @
53f22bd8
#!/sbin/runscript
depend() {
need net
}
start() {
ebegin "Starting accel-pptpd"
start-stop-daemon --start --quiet --exec /usr/sbin/accel-pptpd -- -p /var/run/pptpd.pid ${PPTPD_OPTS}
eend $?
}
stop() {
ebegin "Stopping accel-pptpd"
start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
result=$?
start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/accel-pptpd
result=$(( $result + $? ))
eend $result
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录