1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Remove expired ports:

2019-02-15 net-p2p/verlihub: Uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-chatroom: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-floodprotect: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-forbid: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-iplog: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-isp: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-luascript: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-messanger: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
2019-02-15 net-p2p/verlihub-plugins-stats: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
This commit is contained in:
Rene Ladan 2019-02-16 17:27:29 +00:00
parent 1481f7fd5b
commit 4a8ab979b3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=493051
41 changed files with 10 additions and 1023 deletions

10
MOVED
View File

@ -11611,3 +11611,13 @@ devel/geoip-java||2019-02-16|Has expired: Uses legacy GeoIP 1 format which no lo
dns/go-geodns||2019-02-16|Has expired: Uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
devel/omniORB-4.1||2019-02-16|Has expired: Legacy version please consider using devel/omniORB
devel/omniNotify||2019-02-16|Removed: Unmaintained upstream since 2004
net-p2p/verlihub||2019-02-16|Has expired: Uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-chatroom||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-floodprotect||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-forbid||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-iplog||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-isp||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-luascript||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-messanger||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
net-p2p/verlihub-plugins-stats||2019-02-16|Has expired: Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible

View File

@ -93,16 +93,6 @@
SUBDIR += tribler
SUBDIR += uhub
SUBDIR += valknut
SUBDIR += verlihub
SUBDIR += verlihub-plugins
SUBDIR += verlihub-plugins-chatroom
SUBDIR += verlihub-plugins-floodprotect
SUBDIR += verlihub-plugins-forbid
SUBDIR += verlihub-plugins-iplog
SUBDIR += verlihub-plugins-isp
SUBDIR += verlihub-plugins-luascript
SUBDIR += verlihub-plugins-messanger
SUBDIR += verlihub-plugins-stats
SUBDIR += vuze
SUBDIR += xmrig
SUBDIR += zetacoin

View File

@ -1,15 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= chatroom
PORTVERSION= 1.1
PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Chatroom/${DISTVERSION}
MAINTAINER= me@skylord.ru
PLUGIN_DESC= Chatroom
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (chatroom-1.1.tar.gz) = bba9ce7841245c13d8d4138c85158a161cfd262beffb940d848bc163cdc17b82
SIZE (chatroom-1.1.tar.gz) = 339122

View File

@ -1,9 +0,0 @@
Chatroom plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,21 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= floodprotect
PORTVERSION= 1.6
PORTREVISION= 6
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/OldFiles
DISTNAME= ${PLUGIN_NAME}
MAINTAINER= me@skylord.ru
PLUGIN_NAME= floodprot
PLUGIN_DESC= Floodprotect
# Bug 219281: the port fails to build in C++14 mode (the default in GCC 6),
# switch back to the old default GCC used before.
USE_CXXSTD= gnu++98
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (floodprot.tar.gz) = 1bcabaabcb9921d41cd84a4050e8084237a7a3c4294ccfe8b79ca2d4c4d0830f
SIZE (floodprot.tar.gz) = 409857

View File

@ -1,9 +0,0 @@
Floodprotect plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,15 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= forbid
PORTVERSION= 1.3
PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Forbid/${DISTVERSION}
MAINTAINER= me@skylord.ru
PLUGIN_DESC= ForbiddenWords
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (forbid-1.3.tar.gz) = 6770f74b7d19c49d6547392ff4afd0c2ab4ec7884c947ad48259e4ab85c49b79
SIZE (forbid-1.3.tar.gz) = 291291

View File

@ -1,9 +0,0 @@
ForbiddenWords plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,15 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= iplog
PORTVERSION= 1.1
PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_IPLog/${DISTVERSION}
MAINTAINER= me@skylord.ru
PLUGIN_DESC= IPLog
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (iplog-1.1.tar.gz) = 3941e028472e054245b37bf85d7912cd84753a6cbf16a141e16b8884ab1f38a5
SIZE (iplog-1.1.tar.gz) = 404685

View File

@ -1,9 +0,0 @@
IPLog plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,17 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= isp
PORTVERSION= 1.1
PORTREVISION= 5
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_ISP/${DISTVERSION}
MAINTAINER= me@skylord.ru
PLUGIN_DESC= ISP
PLIST_FILES= share/verlihub/default_pi_isp.sql
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (isp-1.1.tar.gz) = 708c16da22cf8f6146364625bc1b80209cb01ad88d621fca94fa357aa0a35a73
SIZE (isp-1.1.tar.gz) = 233836

View File

@ -1,9 +0,0 @@
ISP plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,49 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= luascript
PORTVERSION= 1.8.1
PORTREVISION= 5
CATEGORIES= net-p2p
PKGNAMEPREFIX= verlihub-plugins-
MASTER_SITES= SF/verlihub/VH_Lua/${DISTVERSION}
MAINTAINER= me@skylord.ru
PLUGIN_NAME= lua
PLUGIN_DESC= LuaScript
USES= lua:51
WRKSRC= ${WRKDIR}/${DISTNAME}
CXXFLAGS+= ${LDFLAGS}
CPPFLAGS+= -I${LUA_INCDIR}
LDFLAGS+= -L${LUA_LIBDIR}
PLIST_FILES= share/verlihub/scripts/ptokax.lua.inc \
share/verlihub/scripts/ptokaxtest.lua \
share/verlihub/scripts/script.lua
OPTIONS_DEFINE= SOCKET
SOCKET_DESC= Build with LuaSocket support
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSOCKET}
BUILD_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51
RUN_DEPENDS+= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51
CONFIGURE_ARGS+= --with-luasocket
.endif
post-patch::
.if ${PORT_OPTIONS:MSOCKET}
@${REINPLACE_CMD} -e 's|-lluasocket|${LUA_MODLIBDIR}/socket/core.so|g' \
-e 's|-lluamime|${LUA_MODLIBDIR}/mime/core.so|g' \
${WRKSRC}/configure
.endif
@${REINPLACE_CMD} -e 's|llua5\.1|llua-${LUA_VER}|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|for libpath in /|for libpath in ${PREFIX} /|g' ${WRKSRC}/config_lua
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (lua-1.8.1.tar.gz) = 212497706b69de53189e6bc1945698fb9c08bf167bb473b6e65c5afb1cc8e384
SIZE (lua-1.8.1.tar.gz) = 425122

View File

@ -1,9 +0,0 @@
LuaScript plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,15 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= messanger
PORTVERSION= 1.2
PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Messanger/${DISTVERSION}
MAINTAINER= me@skylord.ru
PLUGIN_DESC= Messanger
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (messanger-1.2.tar.gz) = 7d17cf4e731ae7754c763fc4e6cf5df70bed4393c9f2214840fd20f7ecd2a93d
SIZE (messanger-1.2.tar.gz) = 243196

View File

@ -1,9 +0,0 @@
Messanger plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,15 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= stats
PORTVERSION= 1.1
PORTREVISION= 7
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Stats/${DISTVERSION}
MAINTAINER= me@skylord.ru
PLUGIN_DESC= Statistics
.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (stats-1.1.tar.gz) = 4a6f5e8e8383424718122c0049e39afa33e2175fe53de533faef0400e31429e8
SIZE (stats-1.1.tar.gz) = 221046

View File

@ -1,9 +0,0 @@
Statistics plugin for the VerliHub.
Verlihub is a Linux/Unix Direct Connect protocol server (Hub).
It is written in c++, has relatively low CPU and RAM usage,
and has many useful features. It also uses a MySQL Database.
Additional functionality is available through a versatile
'plugin' system.
WWW: http://www.verlihub-project.org/

View File

@ -1,28 +0,0 @@
# Created by: Mikle Davidkin <skylord@vt.net.ru>
# $FreeBSD$
PORTNAME= verlihub
PORTVERSION= 1.0
PORTREVISION= 6
CATEGORIES= net-p2p
PKGNAMESUFFIX= -plugins
MAINTAINER= skylord@vt.net.ru
COMMENT= Meta-port for VerliHub plugins
RUN_DEPENDS= \
${LOCALBASE}/lib/libchatroom_pi.so:net-p2p/verlihub-plugins-chatroom \
${LOCALBASE}/lib/libfloodprot_pi.so:net-p2p/verlihub-plugins-floodprotect \
${LOCALBASE}/lib/libforbid_pi.so:net-p2p/verlihub-plugins-forbid \
${LOCALBASE}/lib/libiplog_pi.so:net-p2p/verlihub-plugins-iplog \
${LOCALBASE}/lib/libisp_pi.so:net-p2p/verlihub-plugins-isp \
${LOCALBASE}/lib/liblua_pi.so:net-p2p/verlihub-plugins-luascript \
${LOCALBASE}/lib/libmessanger_pi.so:net-p2p/verlihub-plugins-messanger \
${LOCALBASE}/lib/libstats_pi.so:net-p2p/verlihub-plugins-stats
DEPRECATED= Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
EXPIRATION_DATE=2019-02-15
USES= metaport
.include <bsd.port.mk>

View File

@ -1,41 +0,0 @@
# $FreeBSD$
# common bits for verlihub plugins
# this controls DISTNAME
PLUGIN_NAME?= ${PORTNAME}
PKGNAMEPREFIX= verlihub-plugins-
DISTNAME?= ${PLUGIN_NAME}-${PORTVERSION}
WRKSRC?= ${WRKDIR}/${PLUGIN_NAME}
COMMENT?= ${PLUGIN_DESC} plugin for VerliHub - a Direct Connect protocol server
BUILD_DEPENDS+= ${LOCALBASE}/bin/verlihub:net-p2p/verlihub
RUN_DEPENDS+= ${LOCALBASE}/bin/verlihub:net-p2p/verlihub
DEPRECATED= Verlihub uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
EXPIRATION_DATE=2019-02-15
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES+= libtool
USE_GCC= any
PLIST_FILES+= lib/lib${PLUGIN_NAME}_pi.a \
lib/lib${PLUGIN_NAME}_pi.so \
lib/lib${PLUGIN_NAME}_pi.so.0 \
lib/lib${PLUGIN_NAME}_pi.so.0.0.0 \
etc/verlihub/plugins/lib${PLUGIN_NAME}_pi.so
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGMESSAGE_TEMPLATE= ${PORTSDIR}/net-p2p/verlihub-plugins/pkg-message.plugins
post-build::
@${SED} -e 's,%%PLUGIN_DESC%%,${PLUGIN_DESC},' < \
${PKGMESSAGE_TEMPLATE} > ${PKGMESSAGE}
post-install::
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/verlihub/plugins
${LN} -sf ../../../lib/lib${PLUGIN_NAME}_pi.so \
${STAGEDIR}${PREFIX}/etc/verlihub/plugins

View File

@ -1,3 +0,0 @@
This is a "meta-port" to install the plugins for verlihub.
WWW: http://www.verlihub-project.org/

View File

@ -1,9 +0,0 @@
--------------------------------------------------------------------
This port installs the %%PLUGIN_DESC%% VerliHub plugin.
You need to restart your hub or manually load plugin with
plugman commands.
Visit http://www.verlihub-project.org/ for online support.
-------------------------------------------------------------------

View File

@ -1,35 +0,0 @@
# Created by: Bill Cadwallader <hurbold@yahoo.com>
# $FreeBSD$
PORTNAME= verlihub
DISTVERSION= 0.9.8e-r2
PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/Verlihub/${DISTVERSION}
MAINTAINER= me@skylord.ru
COMMENT= Direct Connect protocol server (Hub)
# XXX: Actually, bash isn't required for building,
# but otherwise configure script would pick the wrong path
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libGeoIP.so:net/GeoIP \
libpcre.so:devel/pcre
RUN_DEPENDS= bash:shells/bash
DEPRECATED= Uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
EXPIRATION_DATE=2019-02-15
LIBS+= -L${LOCALBASE}/lib
USE_RC_SUBR= verlihub
USES= libtool ssl
USE_MYSQL= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
SUB_FILES+= pkg-message
post-patch:
@${REINPLACE_CMD} -e 's|for libpath in /|for libpath in ${PREFIX} /|g' ${WRKSRC}/config_geoip
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (verlihub-0.9.8e-r2.tar.gz) = 3b5132eb3a78b486e2bfd09166dc3206c89bdc8dbfaf98805dfa803cd7574516
SIZE (verlihub-0.9.8e-r2.tar.gz) = 743769

View File

@ -1,71 +0,0 @@
libc++ doesn't like "using namespace std" in C++11
casyncconn.cpp:585:62: error: invalid operands to binary expression ('__bind<int &, sockaddr *, unsigned long>' and 'int')
if(bind(sock, (struct sockaddr *)&mAddrIN, sizeof(mAddrIN)) == -1)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~
Part of https://github.com/Verlihub/verlihub/commit/60609e646824
creguserinfo.cpp:156:32: error: non-constant-expression cannot be narrowed from type 'char' to 'unsigned char' in initializer list [-Wc++11-narrowing]
unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]};
^~~~~~~~~~~~~~~~
creguserinfo.cpp:156:32: note: insert an explicit cast to silence this issue
unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]};
^~~~~~~~~~~~~~~~
static_cast<unsigned char>( )
creguserinfo.cpp:156:49: error: non-constant-expression cannot be narrowed from type 'char' to 'unsigned char' in initializer list [-Wc++11-narrowing]
unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]};
^~~~~~~~~~~~~~~~
creguserinfo.cpp:156:49: note: insert an explicit cast to silence this issue
unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]};
^~~~~~~~~~~~~~~~
static_cast<unsigned char>( )
ParseCommand() returns bool since 1.0.0.0.
script_api.cpp:221:10: error: cannot initialize return object of type 'char *' with an rvalue of type 'bool'
return false;
^~~~~
script_api.cpp:226:46: error: cannot initialize return object of type 'char *' with an rvalue of type 'bool'
if ((!usr) || (usr && !usr->mxConn)) return false;
^~~~~
--- src/casyncconn.cpp.orig 2009-07-10 18:23:05 UTC
+++ src/casyncconn.cpp
@@ -575,7 +573,7 @@ int cAsyncConn::BindSocket(int sock, int port, const c
/* Bind socket to port */
- if(bind(sock, (struct sockaddr *)&mAddrIN, sizeof(mAddrIN)) == -1)
+ if(::bind(sock, (struct sockaddr *)&mAddrIN, sizeof(mAddrIN)) == -1)
{
return -1;
}
--- src/creguserinfo.cpp.orig 2009-05-16 14:56:20 UTC
+++ src/creguserinfo.cpp
@@ -153,7 +153,7 @@ void nDirectConnect::nTables::cRegUserInfo::SetPass(st
static const char *saltchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmlopqrstuvwxyz0123456789./";
static const int saltcharsnum = strlen(saltchars);
- unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]};
+ unsigned char charsalt[2] = {(unsigned char)((char*)&str)[0], (unsigned char)((char*)&str)[1]};
#if HAVE_LIBSSL && HAVE_OPENSSL_MD5_H
unsigned char buf[MD5_DIGEST_LENGTH+1];
--- src/script_api.cpp.orig 2009-05-16 14:42:07 UTC
+++ src/script_api.cpp
@@ -218,12 +218,12 @@ char * ParseCommand(char *command_line)
cServerDC *server = GetCurrentVerlihub();
if(!server) {
cerr << "Server verlihub is unfortunately not running or not found." << endl;
- return false;
+ return NULL;
}
cUser *usr = GetUser((char *) server->mC.hub_security.c_str());
printf("%p\n", usr);
printf("%p", usr->mxConn);
- if ((!usr) || (usr && !usr->mxConn)) return false;
+ if ((!usr) || (usr && !usr->mxConn)) return NULL;
cout << "here" << endl;
if (!server->mP.ParseForCommands(command_line, usr->mxConn)) {
// unknown command

View File

@ -1,24 +0,0 @@
Index: src/verlihub.cpp
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/verlihub.cpp,v
retrieving revision 1.14
diff -u -r1.14 verlihub.cpp
--- src/verlihub.cpp 24 Apr 2005 19:35:30 -0000 1.14
+++ src/verlihub.cpp 8 Dec 2006 21:08:11 -0000
@@ -25,6 +25,7 @@
#include <sstream>
#include <signal.h>
#include <dirent.h>
+#include <dirsettings.h>
#include "script_api.h"
using namespace std;
@@ -81,6 +82,8 @@
const char *DirName = NULL;
char *HomeDir = getenv("HOME");
string tmp;
+ DirName = PREFIXDIR "/etc/verlihub";
+ if ((DirName != NULL) && DirExists(DirName)) ConfigBase = DirName;
if (HomeDir)
{
tmp = HomeDir;

View File

@ -1,18 +0,0 @@
--- src/casyncconn.cpp.orig 2009-07-10 20:23:05.000000000 +0200
+++ src/casyncconn.cpp 2014-09-08 18:37:50.000000000 +0200
@@ -90,7 +90,6 @@
cAsyncConn::cAsyncConn(int desc, cAsyncSocketServer *s, tConnType ct):
cObj("cAsyncConn"),
mSockDesc(desc),
- mIterator(0),
ok(desc>0),
mWritable(true),
mExtraPoll(0),
@@ -147,7 +146,6 @@
mBufReadPos(0),
mRegFlag(0),
mCloseAfter(0,0),
- mIterator(0),
ok(false),
mWritable(true),
mExtraPoll(0),

View File

@ -1,19 +0,0 @@
commit 4d6a2ebf7e47b2854fdf4a9cc7daec625b035b3c
Author: Nimesh Ghelani <nimeshghelani@gmail.com>
Date: Sat Nov 10 01:47:07 2012 +0530
added unistd.h to stringutils.cpp causing compilation error
diff --git a/src/stringutils.cpp b/src/stringutils.cpp
index 35d7d46..b020a79 100755
--- src/stringutils.cpp
+++ src/stringutils.cpp
@@ -32,6 +32,8 @@
#include <ctype.h>
#ifdef _WIN32
#include <windows.h>
+#else
+#include <unistd.h>
#endif
namespace nVerliHub {

View File

@ -1,325 +0,0 @@
Index: casyncconn.cpp
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/casyncconn.cpp,v
retrieving revision 1.89
diff -u -r1.89 casyncconn.cpp
--- src/casyncconn.cpp 12 Sep 2005 21:28:50 -0000 1.89
+++ src/casyncconn.cpp 17 Jun 2006 21:27:43 -0000
@@ -94,33 +94,13 @@
mType(ct)
{
mMaxBuffer=MAX_SEND_SIZE;
- struct sockaddr saddr;
- struct sockaddr_in *addr_in;
- socklen_t addr_size;
-
- addr_size = sizeof(saddr);
- unsigned int addr;
-
mIp=0;
ClearLine();
mBufEnd = mBufReadPos = 0;
mRegFlag = 0;
if(mSockDesc)
{
- if(0 > getpeername(mSockDesc, &saddr, &addr_size))
- {
- if(Log(2)) LogStream() << "Error getting peername, closing" << endl;
- CloseNow();
- }
- addr_in = (struct sockaddr_in *)&saddr;
- // copy IP
- addr = mIp = addr_in->sin_addr.s_addr;
- // asci ip addr
- mAddrIP = inet_ntoa(addr_in->sin_addr);
- // host name
- if( mxServer && mxServer->mUseDNS ) DNSLookup();
- // port number
- mAddrPort=addr_in->sin_port;
+ FetchSockAddr();
}
memset (&mCloseAfter,0, sizeof(mCloseAfter));
}
@@ -168,6 +148,32 @@
this->Close();
}
+/** Fetch IP addr from socket */
+void cAsyncConn::FetchSockAddr()
+{
+ struct sockaddr saddr;
+ struct sockaddr_in *addr_in;
+ socklen_t addr_size;
+
+ addr_size = sizeof(saddr);
+ unsigned int addr;
+
+ if(0 > getpeername(mSockDesc, &saddr, &addr_size))
+ {
+ if(Log(2)) LogStream() << "Error getting peername, closing" << endl;
+ CloseNow();
+ }
+ addr_in = (struct sockaddr_in *)&saddr;
+ // copy IP
+ addr = mIp = addr_in->sin_addr.s_addr;
+ // asci ip addr
+ mAddrIP = inet_ntoa(addr_in->sin_addr);
+ // host name
+ if( mxServer && mxServer->mUseDNS ) DNSLookup();
+ // port number
+ mAddrPort=addr_in->sin_port;
+}
+
/** close connection to peer */
void cAsyncConn::Close()
{
@@ -270,6 +276,7 @@
/** immediately close the connection */
void cAsyncConn::CloseNow()
{
+ OnCloseNow();
mWritable = false;
ok = false;
if(mxServer) mxServer->mConnChooser.cConnChoose::OptOut((cConnBase*)this, cConnChoose::eCC_ALL);
@@ -483,6 +490,8 @@
return -1;
}
ok=true;
+ /* Fetch socket info */
+ FetchSockAddr();
return 0;
}
else
@@ -849,6 +858,9 @@
/** function called before closing nicely */
int cAsyncConn::OnCloseNice(void) { return 0; }
+/** function called before closing now */
+int cAsyncConn::OnCloseNow(void) { return 0; }
+
cMessageParser *cAsyncConn::CreateParser()
{
if (this->mxProtocol != NULL)
Index: cconndc.cpp
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/cconndc.cpp,v
retrieving revision 1.63
diff -u -r1.63 cconndc.cpp
--- src/cconndc.cpp 4 Oct 2005 19:47:38 -0000 1.63
+++ src/cconndc.cpp 17 Jun 2006 21:27:43 -0000
@@ -359,7 +359,13 @@
IPMax = cBanList::Ip2Num(mServer->mC.ip_zone6_max);
if( (IPMin <= IPConn) && (IPMax >= IPConn)) conn->mGeoZone = 6;
}
+
conn->mxProtocol = mProtocol;
+
+ conn->mDCIterator =
+ mServer->mDCConnList.insert(mServer->mDCConnList.begin(),
+ conn);
+
return (cAsyncConn*) conn;
}
@@ -386,6 +392,20 @@
mServer->mCallBacks.mOnCloseConn.CallAll(conn);
#endif
}
+
+ cConnDC::tCLIt it = conn->mDCIterator;
+ cAsyncConn *found=(*it);
+ if( (it == mServer->mDCConnList.end()) || (found != conn) )
+ {
+ cout << "not found " << conn << endl;
+ throw "Trying to delete non-existent connection";
+ }
+
+ //cout << "Deleting connection on socket: " << old_conn->mSockDesc << endl;
+ mServer->mDCConnList.erase(it);
+ cConnDC::tCLIt emptyit;
+ conn->mDCIterator = emptyit;
+
cConnFactory::DeleteConn(Conn);
}
Index: cserverdc.cpp
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/cserverdc.cpp,v
retrieving revision 1.235
diff -u -r1.235 cserverdc.cpp
--- src/cserverdc.cpp 8 Nov 2005 07:51:23 -0000 1.235
+++ src/cserverdc.cpp 17 Jun 2006 21:27:44 -0000
@@ -505,7 +505,7 @@
}
int count=0;
- for(i=mConnList.begin(); i!= mConnList.end(); i++)
+ for(i=mDCConnList.begin(); i!= mDCConnList.end(); i++)
{
conn=(cConnDC *)(*i);
if(conn && conn->ok && conn->mWritable && conn->mpUser && conn->mpUser->mInList)
@@ -529,7 +529,7 @@
cConnDC *conn;
tCLIt i;
int counter = 0;
- for(i=mConnList.begin(); i!= mConnList.end(); i++)
+ for(i=mDCConnList.begin(); i!= mDCConnList.end(); i++)
{
conn=(cConnDC *)(*i);
if(
@@ -555,7 +555,7 @@
cConnDC *conn;
tCLIt i;
int counter = 0;
- for(i=mConnList.begin(); i!= mConnList.end(); i++)
+ for(i=mDCConnList.begin(); i!= mDCConnList.end(); i++)
{
conn=(cConnDC *)(*i);
if(
@@ -579,6 +579,9 @@
/** return negative if conn should be removed */
int cServerDC::OnNewConn(cAsyncConn *nc)
{
+ if(string(nc->mClassName) != string("ConnDC"))
+ return 0;
+
cConnDC *conn = (cConnDC *)nc;
stringstream errmsg,os;
if(!conn) return -1;
@@ -925,7 +928,7 @@
/** return true if accept is allowed - override */
bool cServerDC::AllowNewConn()
{
- return mConnList.size() <= (unsigned) mC.max_users_total + mC.max_extra_regs + mC.max_extra_vips + mC.max_extra_ops + mC.max_extra_cheefs + mC.max_extra_admins + 300;
+ return mDCConnList.size() <= (unsigned) mC.max_users_total + mC.max_extra_regs + mC.max_extra_vips + mC.max_extra_ops + mC.max_extra_cheefs + mC.max_extra_admins + 300;
}
int cServerDC::SaveFile(const string &file, const string &text)
@@ -1280,6 +1283,7 @@
delete work;
return 0;
}
+ return true;
#else
return 0;
#endif
Index: casyncconn.h
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/casyncconn.h,v
retrieving revision 1.50
diff -u -r1.50 casyncconn.h
--- src/casyncconn.h 4 Sep 2005 19:37:06 -0000 1.50
+++ src/casyncconn.h 17 Jun 2006 21:27:44 -0000
@@ -92,6 +92,8 @@
cAsyncConn(int sd=0, cAsyncSocketServer *s=NULL, tConnType ct= eCT_CLIENT);
cAsyncConn(const string & host, int port, bool udp=false);
virtual ~cAsyncConn();
+ /** fetch IP addr from connection */
+ void FetchSockAddr();
/** close connection to peer */
void Close();
/** flush as much from output buffer as possible to the iochannel */
@@ -115,6 +117,8 @@
/** time to close the connection */
cTime mCloseAfter;
+public:
+ /* Anyone know, why we should do this private ??? */
typedef list<cAsyncConn*> tConnList;
typedef tConnList::iterator tCLIt;
@@ -183,6 +187,8 @@
tSocket AcceptSock();
/** function called before closing nicely */
virtual int OnCloseNice(void);
+ /** function called before closing now */
+ virtual int OnCloseNow(void);
/** for udp */
struct sockaddr_in mAddrIN;
@@ -195,7 +201,7 @@
const string & AddrIP(){return mAddrIP;}
const string & AddrHost(){return mAddrHost;}
const int AddrPort(){return mAddrPort;}
- const unsigned long GetSockAddress() { return mAddrIN.sin_addr.s_addr; }
+ const unsigned long GetSockAddress() { return (mType == eCT_CLIENTUDP)?mAddrIN.sin_addr.s_addr:mIp; }
/** reads all available data from the socket and stores it into a static member buffer */
int ReadAll();
Index: casyncsocketserver.h
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/casyncsocketserver.h,v
retrieving revision 1.27
diff -u -r1.27 casyncsocketserver.h
--- src/casyncsocketserver.h 21 Dec 2004 12:48:46 -0000 1.27
+++ src/casyncsocketserver.h 17 Jun 2006 21:27:44 -0000
@@ -96,6 +96,12 @@
cTime mTime;
//
cMeanFrequency<unsigned ,21> mFrequency;
+
+ /* I don't know, why we should make this protected */
+ /** add given connection to server */
+ virtual void addConnection(cAsyncConn *);
+ /** remove given connection from server */
+ void delConnection(cAsyncConn * );
protected: // Protected attributes
/** indicates whether the loop should run or not */
bool mbRun;
@@ -117,10 +123,6 @@
static bool WSinitialized;
cConnFactory *mFactory;
protected: // Protected methods
- /** add given connection to server */
- virtual void addConnection(cAsyncConn *);
- /** remove given connection from server */
- void delConnection(cAsyncConn * );
/** perform input operation, read all data from the connection, return number of bytes read, return negative number, if error occured */
virtual int input(cAsyncConn *conn);
/** perform output operation */
Index: cconndc.h
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/cconndc.h,v
retrieving revision 1.41
diff -u -r1.41 cconndc.h
--- src/cconndc.h 12 Sep 2005 21:28:50 -0000 1.41
+++ src/cconndc.h 17 Jun 2006 21:27:44 -0000
@@ -130,6 +130,7 @@
class cConnDC : public cAsyncConn
{
friend class nProtocol::cDCProto;
+ friend class cDCConnFactory;
public:
cConnDC(int sd=0, cAsyncSocketServer *server=NULL);
virtual ~cConnDC();
@@ -219,6 +220,10 @@
};
sTimes mT;
int mSRCounter;
+
+ // DC++ type connections iterator
+ tCLIt mDCIterator;
+
protected: // Protected methods
/** function called before closing nicely */
int OnCloseNice();
Index: cserverdc.h
===================================================================
RCS file: /cvsroot/verlihub/verlihub/src/cserverdc.h,v
retrieving revision 1.111
diff -u -r1.111 cserverdc.h
--- src/cserverdc.h 14 Sep 2005 20:20:28 -0000 1.111
+++ src/cserverdc.h 17 Jun 2006 21:27:44 -0000
@@ -329,6 +329,11 @@
cTimeOut mHublistTimer;
cTimeOut mReloadcfgTimer;
cVHPluginMgr mPluginManager;
+
+protected:
+ // Protected attributes :D
+ tConnList mDCConnList;
+
private:
struct sCallBacks
{

View File

@ -1,31 +0,0 @@
--------------------------------------------------------------------
Scripts and the executable have been installed in %%PREFIX%%/bin/.
This port requires a working MySQL server installation, either
locally or remotely.
Visit http://www.verlihub-project.org/ for the project's homepage,
manual, forums, scripts and etc.
INSTALLATION
Once you have a properly-running MySQL server, please run install
script:
%%PREFIX%%/bin/vh_install
and follow the instructions given.
UPGRADE
If you upgrade from version prior to 0.9.8e please note the
following:
- Database charset is now set explicitly to UTF8 - verlihub
will alter all tables during the first run. So if you have
used custom charset you should deal with it (backup, i.e.)
before the first run!
- You need to rerun vh_install as during the first installation
-------------------------------------------------------------------

View File

@ -1,36 +0,0 @@
#!/bin/sh
# PROVIDE: verlihub
# REQUIRE: DAEMON mysql
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
# verlihub_enable (bool): Set to NO by default.
# Set it to YES to enable verlihub.
#
. /etc/rc.subr
name="verlihub"
rcvar=verlihub_enable
command=%%PREFIX%%/bin/${name}
pidfile=/var/run/${name}.pid
logfile=/var/log/${name}.log
errfile=/var/log/${name}.err
command_args="> $logfile 2> $errfile &"
: ${verlihub_configdir="`%%PREFIX%%/bin/vh_getcfg`"}
required_dirs="$verlihub_configdir"
required_files="$verlihub_configdir/dbconfig $verlihub_configdir/motd $verlihub_configdir/help_usr $verlihub_configdir/faq $verlihub_configdir/rules"
load_rc_config $name
: ${verlihub_enable="NO"}
start_postcmd="echo \$! > $pidfile"
stop_postcmd="rm $pidfile"
run_rc_command "$1"

View File

@ -1,6 +0,0 @@
Verlihub is a Linux/Unix Direct Connect protocol server (Hub). It is
written in C++, has relatively low CPU and RAM usage, and has many useful
features. It also uses MySQL database. Additional functionality is
available through a versatile plugin system.
WWW: http://www.verlihub-project.org/

View File

@ -1,115 +0,0 @@
bin/verlihub
bin/verlihub_config
bin/vh_getcfg
bin/vh_getdb
bin/vh_install
bin/vh_regnick
bin/vh_restart
bin/vh_runhub
bin/vh_setup
bin/vh_trigger
include/verlihub/cantiflood.h
include/verlihub/casyncconn.h
include/verlihub/casyncsocketserver.h
include/verlihub/cban.h
include/verlihub/cbanlist.h
include/verlihub/ccallbacklist.h
include/verlihub/cchatconsole.h
include/verlihub/ccmdr.h
include/verlihub/ccommand.h
include/verlihub/cconfigbase.h
include/verlihub/cconfigfile.h
include/verlihub/cconfigitembase.h
include/verlihub/cconfmysql.h
include/verlihub/cconnbase.h
include/verlihub/cconnchoose.h
include/verlihub/cconndc.h
include/verlihub/cconnpoll.h
include/verlihub/cconnselect.h
include/verlihub/cconntypes.h
include/verlihub/ccustomredirect.h
include/verlihub/ccustomredirects.h
include/verlihub/cdbconf.h
include/verlihub/cdcclients.h
include/verlihub/cdccommand.h
include/verlihub/cdcconf.h
include/verlihub/cdcconsole.h
include/verlihub/cdcproto.h
include/verlihub/cdctag.h
include/verlihub/cfreqlimiter.h
include/verlihub/cgeoip.h
include/verlihub/cinfoserver.h
include/verlihub/cinterpolexp.h
include/verlihub/ckick.h
include/verlihub/ckicklist.h
include/verlihub/cmeanfrequency.h
include/verlihub/cmessagedc.h
include/verlihub/cmutex.h
include/verlihub/cmysql.h
include/verlihub/cobj.h
include/verlihub/coperator.h
include/verlihub/cpcre.h
include/verlihub/cpenaltylist.h
include/verlihub/cpluginbase.h
include/verlihub/cpluginloader.h
include/verlihub/cpluginmanager.h
include/verlihub/cprotocol.h
include/verlihub/cprotocommand.h
include/verlihub/cquery.h
include/verlihub/creglist.h
include/verlihub/creguserinfo.h
include/verlihub/cserverdc.h
include/verlihub/csetuplist.h
include/verlihub/ctempfunctionbase.h
include/verlihub/cthread.h
include/verlihub/cthreadwork.h
include/verlihub/ctime.h
include/verlihub/ctimeout.h
include/verlihub/ctrigger.h
include/verlihub/ctriggers.h
include/verlihub/curr_date_time.h
include/verlihub/cuser.h
include/verlihub/cusercollection.h
include/verlihub/cvhplugin.h
include/verlihub/cvhpluginmgr.h
include/verlihub/cworkerthread.h
include/verlihub/dirsettings.h
include/verlihub/dll.h
include/verlihub/make_time.h
include/verlihub/script_api.h
include/verlihub/stringutils.h
include/verlihub/tcache.h
include/verlihub/tchashlistmap.h
include/verlihub/thasharray.h
include/verlihub/tlistconsole.h
include/verlihub/tlistplugin.h
include/verlihub/tmysqlmemoryhash.h
include/verlihub/tmysqlmemorylist.h
include/verlihub/tmysqlmemoryordlist.h
include/verlihub/tpluginbase.h
lib/libplug_pi.a
lib/libplug_pi.so
lib/libplug_pi.so.0
lib/libplug_pi.so.0.0.0
lib/libverlihub.a
lib/libverlihub.so
lib/libverlihub.so.0
lib/libverlihub.so.0.0.0
lib/libvhapi.a
lib/libvhapi.so
lib/libvhapi.so.0
lib/libvhapi.so.0.0.0
%%DATADIR%%/config/faq
%%DATADIR%%/config/help_admin
%%DATADIR%%/config/help_cheef
%%DATADIR%%/config/help_master
%%DATADIR%%/config/help_op
%%DATADIR%%/config/help_reg
%%DATADIR%%/config/help_usr
%%DATADIR%%/config/help_vip
%%DATADIR%%/config/motd
%%DATADIR%%/config/rules
%%DATADIR%%/sql/default_conn_types.sql
%%DATADIR%%/sql/default_file_trigger.sql
%%DATADIR%%/sql/default_pi_plug.sql
%%DATADIR%%/sql/default_reglist.sql