- Update to 0.8

- Support staging
- Update LICENSE (BSD 3-clause)

4 files changed, 40 insertions, 23 deletions

diff --git a/net/kippo/Makefile b/net/kippo/Makefile
index e48c06c117ff..24b15bd07c43 100644
--- a/net/kippo/Makefile
+++ b/net/kippo/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	kippo
-PORTVERSION=	0.5
+PORTVERSION=	0.8
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Medium interaction ssh honeypot
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface
@@ -27,15 +27,14 @@ GROUPS=		kippo
 SUB_FILES=	pkg-message
 SUB_LIST+=	PYTHON=${PYTHON_CMD}
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in kippo.cfg kippo.tac fs.pickle
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
 .endfor
-.for d in doc honeyfs kippo txtcmds utils
-	@${MKDIR} ${DATADIR}/${d}
-	@(cd ${WRKSRC}/${d}/ && ${COPYTREE_SHARE} \* ${DATADIR}/${d})
+.for d in data doc honeyfs kippo txtcmds utils
+	@${MKDIR} ${STAGEDIR}${DATADIR}/${d}
+	@(cd ${WRKSRC}/${d}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${d})
 .endfor
 
 post-install:
diff --git a/net/kippo/distinfo b/net/kippo/distinfo
index 5833bb202fbf..518206054736 100644
--- a/net/kippo/distinfo
+++ b/net/kippo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kippo-0.5.tar.gz) = e5faa1aad668f1a5e986db93af7f132268ce059ce2edafc4a93f678864dbdbce
-SIZE (kippo-0.5.tar.gz) = 387148
+SHA256 (kippo-0.8.tar.gz) = 6d1877e8795cb246704c6790aceecfa478478cf79d68f48968588066c6aca265
+SIZE (kippo-0.8.tar.gz) = 581278
diff --git a/net/kippo/files/pkg-message.in b/net/kippo/files/pkg-message.in
index 0ba77e3c45a1..c4d08b2be646 100644
--- a/net/kippo/files/pkg-message.in
+++ b/net/kippo/files/pkg-message.in
@@ -29,5 +29,5 @@ Before starting kippo you need to perform the following steps:
 
 Then you can start kippo by issuing the following command:
 
-	%%PREFIX%%/etc/rc.d/kippo start
+	service kippo start
 ========================================================================
diff --git a/net/kippo/pkg-plist b/net/kippo/pkg-plist
index 2284a1279cc5..371bc65c5d99 100644
--- a/net/kippo/pkg-plist
+++ b/net/kippo/pkg-plist
@@ -1,34 +1,50 @@
 %%DATADIR%%/fs.pickle
 %%DATADIR%%/kippo.cfg
 %%DATADIR%%/kippo.tac
+%%DATADIR%%/data/userdb.txt
 %%DATADIR%%/doc/COPYRIGHT
 %%DATADIR%%/doc/README
 %%DATADIR%%/doc/sql/mysql.sql
-%%DATADIR%%/honeyfs/etc/passwd
+%%DATADIR%%/doc/sql/update2.sql
+%%DATADIR%%/doc/sql/update3.sql
+%%DATADIR%%/doc/sql/update4.sql
+%%DATADIR%%/doc/sql/update5.sql
+%%DATADIR%%/doc/sql/update6.sql
+%%DATADIR%%/doc/sql/update7.sql
+%%DATADIR%%/honeyfs/etc/group
+%%DATADIR%%/honeyfs/etc/hosts
 %%DATADIR%%/honeyfs/etc/issue
+%%DATADIR%%/honeyfs/etc/passwd
+%%DATADIR%%/honeyfs/etc/shadow
 %%DATADIR%%/honeyfs/proc/cpuinfo
+%%DATADIR%%/honeyfs/proc/meminfo
 %%DATADIR%%/kippo/__init__.py
-%%DATADIR%%/kippo/commands/fs.py
-%%DATADIR%%/kippo/commands/base.py
-%%DATADIR%%/kippo/commands/ssh.py
-%%DATADIR%%/kippo/commands/ping.py
-%%DATADIR%%/kippo/commands/ls.py
 %%DATADIR%%/kippo/commands/__init__.py
-%%DATADIR%%/kippo/commands/last.py
+%%DATADIR%%/kippo/commands/adduser.py
 %%DATADIR%%/kippo/commands/apt.py
+%%DATADIR%%/kippo/commands/base.py
 %%DATADIR%%/kippo/commands/dice.py
+%%DATADIR%%/kippo/commands/fs.py
+%%DATADIR%%/kippo/commands/last.py
+%%DATADIR%%/kippo/commands/ls.py
+%%DATADIR%%/kippo/commands/malware.py
+%%DATADIR%%/kippo/commands/ping.py
+%%DATADIR%%/kippo/commands/ssh.py
 %%DATADIR%%/kippo/commands/tar.py
 %%DATADIR%%/kippo/commands/wget.py
-%%DATADIR%%/kippo/commands/adduser.py
-%%DATADIR%%/kippo/core/fs.py
 %%DATADIR%%/kippo/core/__init__.py
-%%DATADIR%%/kippo/core/utils.py
-%%DATADIR%%/kippo/core/ttylog.py
-%%DATADIR%%/kippo/core/honeypot.py
 %%DATADIR%%/kippo/core/config.py
 %%DATADIR%%/kippo/core/dblog.py
+%%DATADIR%%/kippo/core/fs.py
+%%DATADIR%%/kippo/core/honeypot.py
+%%DATADIR%%/kippo/core/interact.py
+%%DATADIR%%/kippo/core/userdb.py
+%%DATADIR%%/kippo/core/utils.py
+%%DATADIR%%/kippo/core/ttylog.py
 %%DATADIR%%/kippo/dblog/__init__.py
 %%DATADIR%%/kippo/dblog/mysql.py
+%%DATADIR%%/kippo/dblog/textlog.py
+%%DATADIR%%/kippo/dblog/xmpp.py
 %%DATADIR%%/txtcmds/bin/dmesg
 %%DATADIR%%/txtcmds/bin/mount
 %%DATADIR%%/txtcmds/sbin/ifconfig
@@ -37,6 +53,8 @@
 %%DATADIR%%/utils/createfs.py
 %%DATADIR%%/utils/passdb.py
 %%DATADIR%%/utils/playlog.py
+%%DATADIR%%/utils/fsctl.py
+@dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/doc/sql
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/honeyfs/etc