Update port: irc/ptlink-ircd Update from 6.18.2 to 6.19.3

Update port: irc/ptlink-services Update from 2.25.1 to 2.26.1

PR:		ports/81067, ports/81068
Submitted by:	Dennis Cabooter <dennis at rootxs dot org> <dennis@serdijn.com>

6 files changed, 53 insertions, 39 deletions

diff --git a/irc/ptlink-ircd/Makefile b/irc/ptlink-ircd/Makefile
index e16a188ea26d..e43a71069486 100644
--- a/irc/ptlink-ircd/Makefile
+++ b/irc/ptlink-ircd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	IRCd
-PORTVERSION=	6.18.2
-PORTREVISION=	1
+PORTVERSION=	6.19.3
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.sunsite.dk/projects/ptlink/ircd/ \
 		http://www.rootxs.org/pub/FreeBSD/distfiles/
diff --git a/irc/ptlink-ircd/distinfo b/irc/ptlink-ircd/distinfo
index 3bc2b3ce67bf..00a8da8fd570 100644
--- a/irc/ptlink-ircd/distinfo
+++ b/irc/ptlink-ircd/distinfo
@@ -1,2 +1,2 @@
-MD5 (PTlink6.18.2.tar.gz) = 58894fc9ffb1c56fac4c45ae342333bc
-SIZE (PTlink6.18.2.tar.gz) = 777072
+MD5 (PTlink6.19.3.tar.gz) = d46979f76e28757fedc508544dd0b5fa 
+SIZE (PTlink6.19.3.tar.gz) = 791346 
diff --git a/irc/ptlink-ircd/files/main.dconf.sample b/irc/ptlink-ircd/files/main.dconf.sample
index 0ccd53aac364..33a498c859fb 100644
--- a/irc/ptlink-ircd/files/main.dconf.sample
+++ b/irc/ptlink-ircd/files/main.dconf.sample
@@ -22,7 +22,7 @@
 ReverseLookup	Yes
 
 # Define if you want to use ident lookup
-CheckIdentd NO
+CheckIdentd No
 
 # Define if you want to hide information notices sent to users
 # during connection.
@@ -77,14 +77,12 @@ CheckTargetLimit	YES
 
 # CheckSpamOnTarget YES
 
-#  DisableStrongVlines
-#
-#   If defined  messages will not be control code stripped and lowercased 
-#   before vline checking. This will save (A LOT) on cpu usage.
-# DisableStrongVlines	YES
-
 # Defines the maxinum number of channels a user can join
-MaxChansPerUser	20
+MaxChansPerUser	5
+
+# Defines the maximum number of channels a registered user can join
+# If defined will override MaxChansPerUser for registered nicks
+MaxChansPerRegUser 20
 
 # Define if you want to use IRCNTP
 # this will make all time stamps to be adjusted with an 
@@ -99,4 +97,10 @@ CodePagePath "codepage"
 # a .cp extension will be appended to the filename
 CodePages "iso8859-1,iso8859-5,iso8859-9,cp1251,cp1253,cp850,cp860,cp866"
 
+# Define if you want users to join a given channel after connect
+# NOTES:
+#   Do not prefix channel names with the # symbol 
+#   You can specify multiple channels splitting them with ","
+# AutoJoinChan "PTlink"
+
 # END OF FILE
diff --git a/irc/ptlink-ircd/files/network.dconf.sample b/irc/ptlink-ircd/files/network.dconf.sample
index 2c6b2cd18ec4..5e281ef55b81 100644
--- a/irc/ptlink-ircd/files/network.dconf.sample
+++ b/irc/ptlink-ircd/files/network.dconf.sample
@@ -4,7 +4,7 @@
 # * This program is distributed under GNU Public License          *
 # * Please read the file COPYING for copyright information.       *
 # *****************************************************************
-# $Id: network.dconf.sample,v 1.14 2004/07/18 09:03:02 stinger Exp $
+# $Id: network.dconf.sample,v 1.19 2004/12/26 09:54:55 stinger Exp $
 # Legend:
 # [YES] - If option value is undefined, YES is assumed
 
@@ -103,6 +103,11 @@ HostSpoofing 	YES
 
 HostPrefix		"PTlink"
 
+# Used for spoof method 0
+# Use a random set of numbers to crypt the hosts
+# NOTE: If you have a network, make sure all network servers use the SAME CryptKey
+CryptKey 77335465
+
 # Spoofed mask settings
 # You can use "+" on the beginning of the mask to provide a @nick.mask format
     
@@ -127,29 +132,35 @@ HostPrefix		"PTlink"
   # Helper mask
   HelperMask	"Helper.PTlink.net"
   
-# If YES a nick needs to have +r before getting /oper [ YES ]
-OnlyRegisteredOper	YES
+
   
-# IRC Operator privileges
+# IRC Operator Options
+
+	# If YES a nick needs to have +r before getting /oper [ YES ]
+	OnlyRegisteredOper	YES
+
+	# If YES Opers are able to join +i/+k/+l channels (also if banned)
+	OperCanAlwaysJoin	NO
 
-# If YES Opers are able to join +i/+k/+l channels (also if banned)
-OperCanAlwaysJoin	NO
+	# If YES Opers can always send messages to any channel
+	OperCanAlwaysSend 	YES
 
-# If YES Opers can always send messages to any channel
-OperCanAlwaysSend 	YES
+	# if YES Opers are able to change their host with /NEWMASK
+	OperCanUseNewMask	YES
 
-# if YES Opers are able to change their host with /NEWMASK
-OperCanUseNewMask	YES
+	# if YES Opers cannot be kicked by normal users
+	OperKickProtection	NO
 
-# if YES Opers cannot be kicked by normal users
-OperKickProtection	NO
+	# if defined allows a IRC Opers to join any channel
+	# if using OperByPass string has the key
+	OperByPass	"operbypass"
 
-# if defined allows a IRC Opers to join any channel
-# if using OperByPass string has the key
-OperByPass	"operbypass"
+	# If defined allows self /kills
+	EnableSelfKill		NO
 
-# If defined allows self /kills
-EnableSelfKill		NO
+	# If defined will remove oper flag when the user is idle
+	# for more than MaxOperIdleTime
+	MaxOperIdleTime		1h
 
 # Disable the /links command to users?
 DisableLinksForUsers   NO
@@ -158,7 +169,6 @@ DisableLinksForUsers   NO
 NoCTCP_Msg	"cannot send CTCP's to channel"
 Moderated_Msg	"channel is moderated, you do not have a voice"
 NoExternal_Msg	"channel does not allow external messages"
-NoColors_Msg 	"channel does not allow mIRC/ANSI colors"
 Banned_Msg	"you are banned from this channel"
 NoSpam_Msg	"no url/server messages allowed on this channel"
 NoFlood_Msg	"cannot send repeated messages to this channel"
@@ -205,7 +215,8 @@ DefaultGLineTime    10d
 DefaultGLineReason  "Please read http://www.ptlink.net/aup/"
 
 # Do you want to GLine all users that are killed by Excess Flood?
-GLineOnExcessFlood NO
+# If set 0d it will be disabled
+# GLineOnExcessFlood 1d
 
 # If YES all users will be able to use /IRCOPS to list online opers
 IRCopsForAll		Yes
@@ -226,4 +237,6 @@ AllowSetNameToEveryone 	No
 # IRC Operators will see usermodes and realhost of the user they do a /whois on
 WhoisExtension	No
 
-# END OF FILE
+# When defined will automatically set users as away when
+# they become idle more than AutoAwayIdleTime .
+AutoAwayIdleTime 1h
diff --git a/irc/ptlink-ircd/files/patch-tools::install_ircd b/irc/ptlink-ircd/files/patch-tools::install_ircd
index a884e627b9ca..9d442b27bae5 100644
--- a/irc/ptlink-ircd/files/patch-tools::install_ircd
+++ b/irc/ptlink-ircd/files/patch-tools::install_ircd
@@ -1,5 +1,5 @@
---- tools/install_ircd.orig	Tue Oct 26 08:59:37 2004
-+++ tools/install_ircd	Tue Oct 26 09:00:08 2004
+--- tools/install_ircd.orig	Sun May 15 13:25:29 2005
++++ tools/install_ircd	Sun May 15 13:24:43 2005
 @@ -120,12 +120,12 @@
  # try to install the example files if needed
  
@@ -16,6 +16,6 @@
 +#check_install_data ${ETCPATH} samples/kline.conf
 +#check_install_data ${ETCPATH}/main.dconf samples/main.dconf.sample
 +#check_install_data ${ETCPATH}/network.dconf samples/network.dconf.sample
- check_install_data_old ${ETCPATH}/help.user samples/help.user
- check_install_data_old ${ETCPATH}/help.oper samples/help.oper
- check_install_data_old ${ETCPATH}/help.admin samples/help.admin
+ if  [ "${EXESUFFIX}" != "" ]; then
+   check_install_data ${ETCPATH}/resolv.conf samples/resolv.conf.sample
+ fi
diff --git a/irc/ptlink-ircd/pkg-plist b/irc/ptlink-ircd/pkg-plist
index b6e506e0aba4..ee841e7daad6 100644
--- a/irc/ptlink-ircd/pkg-plist
+++ b/irc/ptlink-ircd/pkg-plist
@@ -23,7 +23,5 @@ etc/ptlink/main.dconf.sample
 etc/ptlink/network.dconf.sample
 etc/ptlink/opers.motd.sample
 etc/ptlink/version.info
-@dirrm var/log
-@dirrm var
 @dirrm etc/ptlink/codepage
 @unexec rmdir %D/etc/ptlink 2> /dev/null || true