Skip to content

Commit

Permalink
Misc update due to source repository changes (moved to github).
Browse files Browse the repository at this point in the history
Also removed innbbsd references.
  • Loading branch information
hungte committed Nov 4, 2014
1 parent ed71cbf commit 6ad941c
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 298 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
*.o
*.a
*.o
*.pyc
.depend
.clang_complete
tags
var.h
/pttbbs.conf
/local.h
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
SUBDIR= common mbbsd util trans
SUBDIR= common mbbsd util

.include <bsd.subdir.mk>

.ORDER: all-common all-mbbsd
.ORDER: all-common all-util
.ORDER: all-common all-trans
10 changes: 2 additions & 8 deletions README
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
�峹�������γ̫�s�׮ɶ��O:
$Id$

�ֳt�w�˽аѦ� docs/INSTALL �H�� docs/FAQ
�ԲӤ��Ш� docs/

Expand All @@ -11,8 +8,8 @@ $Id$
�ؿ����c:
LICENSE ���n��U�ɮצb���t�~���w�ɪ����v�覡
�Ъ`�N�����ɮרϥΤ��P�����v (�p BSD License)
�ѩ� GPL ������A���v���ۮe���{���X���w�w�]�����ϥ�
�æ����� GPL �ۮe���������N�ε{���X�H�����\�৹��C
�ѩ� GPL ������A���v���ۮe���{���X�w�w�]�����ϥ�
�æ����� GPL �ۮe���������N�ε{���X�H�����\�৹��
�Ա��P�]�w�аѨ��U�ɮפ���C

docs/ ���
Expand All @@ -32,10 +29,7 @@ $Id$
pttbbs.conf �d�ҳ]�w�� (����)
pttbbs_minimal.conf �̤p�]�w��

innbbsd/ ��H

web/ Web �����t��
blog/ PttBlog
static/ �R�A�����s���ɭ� (��Ū)
daemon/ �I���A�Ȧ��A�{��
utmpd/ utmp cache server (experimental)
Expand Down
1 change: 0 additions & 1 deletion UPDATING
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-----------------------------------------------------------------------------
PTT BBS [Current] Updating Log (in Big5 encoding)
$Id$
-----------------------------------------------------------------------------

�o�̬O PTT Current �����j��s�O���A�D�n�O�u�ɮ׮榡�v�Φ�m�����n���ܡB
Expand Down
3 changes: 1 addition & 2 deletions docs/DONATE
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
�o�g�峹�y�z�����٧U PttBBS . �峹�������γ̫�s�׮ɶ��O:
$Id$
�o�g�峹�y�z�����٧U PttBBS .

Donate to PttBBS!
PttBBS �O�K�O�ۥѳn��, �ڭ̳z�L�o�M�t��(���p�z��W�o�@��), �b�x�j
Expand Down
28 changes: 3 additions & 25 deletions docs/FAQ
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
�o�g�峹�y�z PttBBS ���`�Q�ݨ쪺���D�θѨM�覡. �峹�������γ̫�s�׮ɶ��O:
$Id$
�o�g�峹�y�z PttBBS ���`�Q�ݨ쪺���D�θѨM�覡.

1. PttBBS���Q�װϡA�H�Φp��H�e�קﵹ�x��
2. �b Linux���U�X�{ Makefile ���~.
3. �[�j shared-memory
4. �]�w group
5. ���l�ѽL�S���X�{
6. sendmail.cf�n�諸�a��(�Ѧҥ�) (by DavidYu)
7. /usr/libexec/elf/ld: cannot find -liconv
�� iconv.h: No such file or directory
8. �p������ ssh�覡�i bbs���αK�X
7. �p������ ssh�覡�i bbs���αK�X
------------------------------------------------------------------------------
1.PttBBS���Q�װϡA�H�Φp��H�e�קﵹ�x��

Expand Down Expand Up @@ -127,26 +124,7 @@ Mbbsmail, P=/home/bbs/bin/bbsmail, F=lsSDFMhPu, U=bbs, S=10,R=20/40,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

------------------------------------------------------------------------------
7./usr/libexec/elf/ld: cannot find -liconv
�� iconv.h: No such file or directory
�]���s�� innbbsd���[�J�F RFC 2045 support, ���n libiconv .
�z�����n���w�� libiconv (/usr/ports/converters/libiconv/ in FreeBSD)
�A���s make �Y�i

�Y�z�w�g�w�ˤF libiconv ���L�٬O�䤣��,
�бN�� lib�Ҧb�� path (/usr/local/lib in FreeBSD)
�[�� innbbsd/Makefile �� LDFLAGS �� (line 43)
LDFLAGS+= -liconv
�令:
LDFLAGS+= -liconv -L/usr/local/lib

�b Linux �ٹҤU libiconv �Q�]�t�b libc ��, �ҥH -liconv �O���ݭn��
�бN innbbsd/Makefile �� LDFLAGS (line 43)
LDFLAGS+= -liconv
�R��

------------------------------------------------------------------------------
8. �p������ ssh�覡�i bbs���αK�X
7. �p������ ssh�覡�i bbs���αK�X
���b /etc/ssh/sshd_config ����
#PermitEmptyPasswords no
�令
Expand Down
30 changes: 9 additions & 21 deletions docs/INSTALL
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
�o�g��󻡩��ֳt�w�˪���k, �峹�������γ̫�s�׮ɶ��O:
$Id$

==============
�H root ���v��
Expand Down Expand Up @@ -33,20 +32,18 @@ $Id$
====================

7. �z�i�H�z�L�U�C�覡�U���쥻������l�{���X:
https://OpenSVN.csie.org/pttbbs/trunk/
https://github.com/ptt/pttbbs
�o�O�ثe�D�n�}�o������, �]�O�����~�{�M����ߨ�ӯ��x
�ҨϥΪ�����. �b�o�Ӫ������t���̷s���{��, ���O�i��|��í�w,
�� bug, �ƦܩM���e���������ۮe. ��ij�z����¦���{����O, ��
�H�ɪ`�N PttCurrent �ݪO (�b telnet://ptt.cc��, �Υi�H�ϥ�
�H�ɪ`�N PttCurrent �ݪO (�b telnet://ptt.cc ��, �Υi�H�ϥ�
�������� http://www.ptt.cc/bbs/PttCurrent/index.html) , ��
����z�b��s�{�����ɭ�.

�z�L subversion �pô pttbbs version control repository(��4)
���� svn checkout http://OpenSVN.csie.org/pttbbs/trunk/pttbbs
git clone http://github.com/ptt/pttbbs

�z�i�H�b�ӥؿ��U�����z�L svn update ��s�� pttbbs �̷s�����X. �p:
cd /home/bbs/pttbbs; svn update
(�����w�� subversion, ����4)
�z�i�H�b�ӥؿ��U�����z�L git pull ��s�� pttbbs �̷s�����X. �p:
cd /home/bbs/pttbbs; git pull; git rebase

8. ������ pttbbs ���ؿ��U ( cd ~bbs/pttbbs )
9. �p�G�z�� pttbbs.conf�ä��s�b, �i�H���@���w�]���ӥ�:
Expand All @@ -58,14 +55,9 @@ $Id$
* �p�G�z�O�� Linux�t��, ���w�� pmake, �M��N make alias �� pmake *
* �p�G�z�O�� MacOSX �t��, ���� ports �w�� bmake,
�M��N make alias �� pmake *
11.�b�sĶ pttbbs ���e, �z�ݭn���˦n libiconv, zip, pgp
�p�G�z�ϥΪ��O FreeBSD, �i�H�����z�L ports�w��:
cd /usr/ports/converters/libiconv; make install
cd /usr/ports/archivers/zip; make install
cd /usr/ports/security/pgp; make install
12. (�b ~bbs/pttbbs �U) ���� make BBSHOME=/home/bbs all install
13.�p�G�O�s�[�_�Ӫ���, �а��� cd sample; make install
14.���� cd /home/bbs; bin/initbbs -DoIt
11. (�b ~bbs/pttbbs �U) ���� make BBSHOME=/home/bbs all install
12.�p�G�O�s�[�_�Ӫ���, �а��� cd sample; make install
13.���� cd /home/bbs; bin/initbbs -DoIt

�䤤�� 13 �H�� 14 �B�O���Ĥ@���w�˪��ɭԨϥΪ�,
�p�G�z�� BBS���w�g����ƤF, �аȥ����n����o��ӨB�J.
Expand Down Expand Up @@ -126,8 +118,4 @@ $Id$
�ӱҰʥi�H bind port 23 �� mbbsd.
��� ptt/ptt2 �W�Ҫ��W�Ťj���A�٦��t�@�ӿ�ܬO�ϥ� daemon/logind �C

4. �z�������w�� subversion (�аѦҩx����� http://subversion.tigris.org/ )
�b FreeBSD���U, �����ϥ� ports �w�˧Y�i:
cd /usr/ports/devel/subversion/; make all install
��L�@�~�t�νаѦ� http://subversion.tigris.org/project_packages.html
�������.
4. �z�������w�� git (�аѦҩx����� http://git-scm.com/ )
10 changes: 0 additions & 10 deletions sample/crontab
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,6 @@
#*/5 * * * * bin/shmsweep
#*/10 * * * * bin/userlist

# 轉信
*/30 * * * * (kill -0 `cat /tmp/innbbsd-7777.pid` || innd/innbbsd 7777)
0,30 2-21 * * * innd/bbslink /home/bbs
0 3 * * * bin/inndBM
10 3 * * * innd/ctlinnbbsd reload
17,47 2,4-21 * * * innd/bbsnnrpall.auto.sh
40 3 * * * /bin/mv innd/bbslog innd/bbslog.old
40 2 * * * /bin/mv innd/log/inndBM.log innd/log/inndBM.log.old
40 2 * * * /bin/mv innd/log/inndBM.log.err innd/log/inndBM.log.err.old

# jobspool
10 3-20 * * * bin/waterball.pl
30 3 * * * bin/tarqueue.pl
Expand Down
11 changes: 0 additions & 11 deletions sample/innd/Makefile

This file was deleted.

1 change: 0 additions & 1 deletion sample/innd/bbsname.bbs

This file was deleted.

Empty file removed sample/innd/ncmperm.bbs
Empty file.
3 changes: 0 additions & 3 deletions sample/innd/newsfeeds.bbs

This file was deleted.

4 changes: 0 additions & 4 deletions sample/innd/nodelist.bbs

This file was deleted.

1 change: 0 additions & 1 deletion sample/innd/ntu.active

This file was deleted.

4 changes: 0 additions & 4 deletions sample/pttbbs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ start)
# 寄信至站外
/usr/bin/su -fm bbs -c /home/bbs/bin/outmail &

# 轉信
/usr/bin/su -fm bbs -c /home/bbs/innd/innbbsd &

# 啟動 port 23 (port 23須使用 root 才能進行 bind ) 以其他
/home/bbs/bin/bbsctl start

Expand All @@ -23,7 +20,6 @@ start)
;;
stop)
/usr/bin/killall outmail
/usr/bin/killall innbbsd
/usr/bin/killall mbbsd
/usr/bin/killall shmctl
/bin/sleep 2; /usr/bin/killall shmctl
Expand Down
1 change: 0 additions & 1 deletion sample/rc.local
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@

/usr/bin/su bbsadm -c /home/bbs/bin/shmctl init
/usr/bin/su bbsadm -c /home/bbs/bin/outmail&
/usr/bin/su bbsadm -c /home/bbs/innd/innbbsd 7777
/home/bbs/bin/bbsctl start
2 changes: 1 addition & 1 deletion util/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CPROG_WITH_UTIL= \
expire mandex broadcast \
openticket topusr \
toplazyBM writemoney \
reaper buildAnnounce inndBM mailangel \
reaper buildAnnounce mailangel \
outmail chkhbf merge_dir \
angel gamblegive \
chesscountry tunepasswd buildir xchatd \
Expand Down
1 change: 0 additions & 1 deletion util/account.c
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,6 @@ main(/*int argc, char **argv*/)

printf("壓縮使用者上線監控\n");
gzip(log_file, "usies", buf);
gzip("innd/bbslog", "innbbsd", buf);
gzip("etc/mailog", "mailog", buf);

/* Ptt 節日處理 */
Expand Down

0 comments on commit 6ad941c

Please sign in to comment.