20180102_jeffrey - silenceuncrio/diary GitHub Wiki
0905
review
1400
➜ proscend git:(develop) git flow feature start pptpd
Switched to a new branch 'feature/pptpd'
Summary of actions:
- A new branch 'feature/pptpd' was created, based on 'develop'
- You are now on branch 'feature/pptpd'
Now, start committing on your feature. When done, use:
git flow feature finish pptpd
1440
commit 15d8a210e52ba332cf7544fd832a0262c805e9d0
Refs: [feature/pptpd]
Author: jeffrey <[email protected]>
Date: Tue Jan 2 14:40:12 2018 +0800
add compile flag 'PROSRC_PPTPD'
proscend/mconfig/Config.in | 1 +
1 file changed, 1 insertion(+)
1445
commit e1bde68119da29af33c844865969b43d7cedcf82
Refs: [feature/pptpd]
Author: jeffrey <[email protected]>
Date: Tue Jan 2 14:45:29 2018 +0800
copy the opensrc 'pptpd-1.4.0' from project '579X'
proscend/opensrc/pptpd-1.4.0/AUTHORS | 54 +
proscend/opensrc/pptpd-1.4.0/COPYING | 339 +
proscend/opensrc/pptpd-1.4.0/ChangeLog | 797 +++
proscend/opensrc/pptpd-1.4.0/INSTALL | 188 +
proscend/opensrc/pptpd-1.4.0/Make.pro | 30 +
proscend/opensrc/pptpd-1.4.0/Makefile | 906 +++
proscend/opensrc/pptpd-1.4.0/Makefile.am | 109 +
proscend/opensrc/pptpd-1.4.0/Makefile.in | 892 +++
proscend/opensrc/pptpd-1.4.0/Makefile.uClinux | 68 +
proscend/opensrc/pptpd-1.4.0/NEWS | 143 +
proscend/opensrc/pptpd-1.4.0/README | 30 +
proscend/opensrc/pptpd-1.4.0/README.bcrelay | 72 +
proscend/opensrc/pptpd-1.4.0/README.cvs | 32 +
proscend/opensrc/pptpd-1.4.0/README.inetd | 45 +
proscend/opensrc/pptpd-1.4.0/README.logwtmp | 36 +
proscend/opensrc/pptpd-1.4.0/README.portslave | 12 +
proscend/opensrc/pptpd-1.4.0/README.slirp | 29 +
proscend/opensrc/pptpd-1.4.0/TODO | 110 +
proscend/opensrc/pptpd-1.4.0/acconfig.h | 50 +
proscend/opensrc/pptpd-1.4.0/aclocal.m4 | 983 +++
proscend/opensrc/pptpd-1.4.0/bcrelay.8 | 59 +
proscend/opensrc/pptpd-1.4.0/bcrelay.c | 1131 ++++
proscend/opensrc/pptpd-1.4.0/compat.c | 229 +
proscend/opensrc/pptpd-1.4.0/compat.h | 80 +
proscend/opensrc/pptpd-1.4.0/config.embed.h | 13 +
proscend/opensrc/pptpd-1.4.0/config.h | 190 +
proscend/opensrc/pptpd-1.4.0/config.h.in | 189 +
proscend/opensrc/pptpd-1.4.0/config.log | 1524 +++++
proscend/opensrc/pptpd-1.4.0/config.sh | 3 +
proscend/opensrc/pptpd-1.4.0/config.status | 1209 ++++
proscend/opensrc/pptpd-1.4.0/configfile.c | 189 +
proscend/opensrc/pptpd-1.4.0/configfile.h | 12 +
proscend/opensrc/pptpd-1.4.0/configure | 6825 ++++++++++++++++++++
proscend/opensrc/pptpd-1.4.0/configure.in | 296 +
proscend/opensrc/pptpd-1.4.0/ctrlpacket.c | 769 +++
proscend/opensrc/pptpd-1.4.0/ctrlpacket.h | 16 +
proscend/opensrc/pptpd-1.4.0/debian/README.debian | 8 +
proscend/opensrc/pptpd-1.4.0/debian/changelog | 182 +
proscend/opensrc/pptpd-1.4.0/debian/conffiles | 3 +
proscend/opensrc/pptpd-1.4.0/debian/config | 22 +
proscend/opensrc/pptpd-1.4.0/debian/control | 15 +
proscend/opensrc/pptpd-1.4.0/debian/copyright | 11 +
proscend/opensrc/pptpd-1.4.0/debian/dirs | 4 +
proscend/opensrc/pptpd-1.4.0/debian/docs | 8 +
proscend/opensrc/pptpd-1.4.0/debian/examples | 3 +
proscend/opensrc/pptpd-1.4.0/debian/po/POTFILES.in | 1 +
proscend/opensrc/pptpd-1.4.0/debian/po/fr.po | 208 +
proscend/opensrc/pptpd-1.4.0/debian/po/pt_BR.po | 204 +
.../opensrc/pptpd-1.4.0/debian/po/templates.pot | 170 +
proscend/opensrc/pptpd-1.4.0/debian/pptpd-options | 94 +
proscend/opensrc/pptpd-1.4.0/debian/pptpd.conf | 80 +
proscend/opensrc/pptpd-1.4.0/debian/pptpd.init | 56 +
proscend/opensrc/pptpd-1.4.0/debian/pptpdconfig.pl | 81 +
proscend/opensrc/pptpd-1.4.0/debian/rules | 78 +
proscend/opensrc/pptpd-1.4.0/debian/templates | 75 +
proscend/opensrc/pptpd-1.4.0/defaults.h | 76 +
proscend/opensrc/pptpd-1.4.0/getopt.c | 1136 ++++
proscend/opensrc/pptpd-1.4.0/getopt1.c | 205 +
proscend/opensrc/pptpd-1.4.0/html/HOWTO-PoPToP.txt | 873 +++
.../pptpd-1.4.0/html/poptop_ads_howto/diagram1.jpg | Bin 0 -> 14842 bytes
.../html/poptop_ads_howto/poptop_ads_howto_1.htm | 172 +
.../html/poptop_ads_howto/poptop_ads_howto_10.htm | 84 +
.../html/poptop_ads_howto/poptop_ads_howto_11.htm | 83 +
.../html/poptop_ads_howto/poptop_ads_howto_12.htm | 105 +
.../html/poptop_ads_howto/poptop_ads_howto_2.htm | 47 +
.../html/poptop_ads_howto/poptop_ads_howto_3.htm | 68 +
.../html/poptop_ads_howto/poptop_ads_howto_4.htm | 54 +
.../html/poptop_ads_howto/poptop_ads_howto_5.htm | 71 +
.../html/poptop_ads_howto/poptop_ads_howto_6.htm | 66 +
.../html/poptop_ads_howto/poptop_ads_howto_6a.htm | 37 +
.../html/poptop_ads_howto/poptop_ads_howto_7.htm | 104 +
.../html/poptop_ads_howto/poptop_ads_howto_8.htm | 103 +
.../html/poptop_ads_howto/poptop_ads_howto_9.htm | 62 +
.../html/poptop_ads_howto/poptop_ads_howto_a1.htm | 55 +
.../html/poptop_ads_howto/poptop_ads_howto_a2.htm | 34 +
.../html/poptop_ads_howto/poptop_ads_howto_a3.htm | 41 +
.../html/poptop_ads_howto/poptop_ads_howto_a4.htm | 34 +
.../html/poptop_ads_howto/poptop_ads_howto_a5.htm | 87 +
.../html/poptop_ads_howto/poptop_ads_howto_a6.htm | 40 +
.../pptpd-1.4.0/html/poptop_ads_howto/test.txt | 1 +
.../pptpd-1.4.0/html/setup_pptp_client.html | 89 +
proscend/opensrc/pptpd-1.4.0/install-sh | 251 +
proscend/opensrc/pptpd-1.4.0/inststr.c | 55 +
proscend/opensrc/pptpd-1.4.0/inststr.h | 15 +
proscend/opensrc/pptpd-1.4.0/makepackage | 36 +
proscend/opensrc/pptpd-1.4.0/missing | 360 ++
proscend/opensrc/pptpd-1.4.0/mkinstalldirs | 40 +
proscend/opensrc/pptpd-1.4.0/our_getopt.h | 175 +
proscend/opensrc/pptpd-1.4.0/our_syslog.h | 42 +
proscend/opensrc/pptpd-1.4.0/plugins/Makefile | 34 +
proscend/opensrc/pptpd-1.4.0/plugins/patchlevel.h | 5 +
.../opensrc/pptpd-1.4.0/plugins/pptpd-logwtmp.c | 84 +
proscend/opensrc/pptpd-1.4.0/ppphdlc.c | 96 +
proscend/opensrc/pptpd-1.4.0/ppphdlc.h | 15 +
proscend/opensrc/pptpd-1.4.0/pptpctrl.8 | 134 +
proscend/opensrc/pptpd-1.4.0/pptpctrl.c | 945 +++
proscend/opensrc/pptpd-1.4.0/pptpctrl.h | 18 +
proscend/opensrc/pptpd-1.4.0/pptpd.8 | 198 +
proscend/opensrc/pptpd-1.4.0/pptpd.c | 974 +++
proscend/opensrc/pptpd-1.4.0/pptpd.conf.5 | 250 +
proscend/opensrc/pptpd-1.4.0/pptpd.init | 58 +
proscend/opensrc/pptpd-1.4.0/pptpd.spec | 172 +
proscend/opensrc/pptpd-1.4.0/pptpdefs.h | 339 +
proscend/opensrc/pptpd-1.4.0/pptpgre.c | 595 ++
proscend/opensrc/pptpd-1.4.0/pptpgre.h | 66 +
proscend/opensrc/pptpd-1.4.0/pptpmanager.c | 644 ++
proscend/opensrc/pptpd-1.4.0/pptpmanager.h | 22 +
proscend/opensrc/pptpd-1.4.0/pqueue.c | 285 +
proscend/opensrc/pptpd-1.4.0/pqueue.h | 31 +
proscend/opensrc/pptpd-1.4.0/reconf | 61 +
proscend/opensrc/pptpd-1.4.0/samples/chap-secrets | 3 +
proscend/opensrc/pptpd-1.4.0/samples/options.pptpd | 128 +
proscend/opensrc/pptpd-1.4.0/samples/pptpd.conf | 106 +
proscend/opensrc/pptpd-1.4.0/stamp-h1 | 1 +
proscend/opensrc/pptpd-1.4.0/tools/pptp-portslave | 6 +
proscend/opensrc/pptpd-1.4.0/tools/vpnstats | 55 +
proscend/opensrc/pptpd-1.4.0/tools/vpnstats.pl | 125 +
proscend/opensrc/pptpd-1.4.0/tools/vpnuser | 59 +
proscend/opensrc/pptpd-1.4.0/version | 24 +
119 files changed, 29196 insertions(+)
1600
➜ pptpd-1.4.0 git:(feature/pptpd) git flow feature finish pptpd
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Merge made by the 'recursive' strategy.
proscend/mconfig/Config.in | 1 +
proscend/opensrc/Makefile | 1 +
...
create mode 100644 proscend/opensrc/pptpd-1.4.0/version
Deleted branch feature/pptpd (was ad69dae).
Summary of actions:
- The feature branch 'feature/pptpd' was merged into 'develop'
- Feature branch 'feature/pptpd' has been removed
- You are now on branch 'develop'
➜ pptpd-1.4.0 git:(develop)
1605
commit 26f2e48e3baf5206ef732ece4427c16c865b43d8
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Tue Jan 2 16:05:32 2018 +0800
modify the opensrc 'pptpd-1.4.0' for passing compile
proscend/opensrc/Makefile | 1 +
proscend/opensrc/pptpd-1.4.0/Make.pro | 13 ++-----------
proscend/opensrc/pptpd-1.4.0/Makefile | 4 ++--
proscend/opensrc/pptpd-1.4.0/config.h | 2 +-
proscend/opensrc/pptpd-1.4.0/plugins/Makefile | 2 +-
5 files changed, 7 insertions(+), 15 deletions(-)
1755
commit 0cba9373f054f92b7f9b545bfdae119cc7361866
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Tue Jan 2 17:52:32 2018 +0800
add 'pptpd' icos module
- apply() not implement yet
.../rootfs/home/factory/icos/pptpd/pptpd.json | 7 +
proscend/prosrc/icos/icoslib/Makefile | 3 +
proscend/prosrc/icos/icoslib/entry.c | 7 +
proscend/prosrc/icos/icoslib/pptpd/Makefile | 14 +
proscend/prosrc/icos/icoslib/pptpd/pptpd.c | 436 +++++++++++++++++++++
proscend/prosrc/icos/include/icos_common.h | 1 +
proscend/prosrc/icos/include/icos_module.h | 1 +
proscend/prosrc/icos/include/module_pptpd.h | 77 ++++
8 files changed, 546 insertions(+)
commit 26f2e48e3baf5206ef732ece4427c16c865b43d8
1800
commit a17f1083bbe548dcf06db3930962ad76ca8f5739
Refs: [develop], {origin/develop}
Author: jeffrey <[email protected]>
Date: Tue Jan 2 17:58:49 2018 +0800
add 'pptpd' CGI
proscend/prosrc/webcgi/Makefile | 4 ++
proscend/prosrc/webcgi/pptpd.c | 105 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+)