|
[-]
[+]
|
Changed |
znc.changes
|
|
|
|
[-]
[+]
|
Changed |
znc.spec
^
|
|
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/Chan.cpp
^
|
| @@ -54,6 +54,7 @@
void CChan::Reset() {
m_bIsOn = false;
+ m_bModeKnown = false;
m_musModes.clear();
m_sTopic = "";
m_sTopicOwner = "";
@@ -604,3 +605,8 @@
}
}
}
+
+void CChan::Enable() {
+ ResetJoinTries();
+ m_bDisabled = false;
+}
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/Chan.h
^
|
| @@ -100,6 +100,7 @@
// !wrappers
// Setters
+ void SetModeKnown(bool b) { m_bModeKnown = b; }
void SetIsOn(bool b) { m_bIsOn = b; if (!b) { Reset(); } }
void SetKey(const CString& s) { m_sKey = s; }
void SetTopic(const CString& s) { m_sTopic = s; }
@@ -112,12 +113,13 @@
void SetInConfig(bool b) { m_bInConfig = b; }
void SetCreationDate(unsigned long u) { m_ulCreationDate = u; }
void Disable() { m_bDisabled = true; }
- void Enable() { m_bDisabled = false; }
+ void Enable();
void IncJoinTries() { m_uJoinTries++; }
void ResetJoinTries() { m_uJoinTries = 0; }
// !Setters
// Getters
+ bool IsModeKnown() const { return m_bModeKnown; }
bool HasMode(unsigned char uMode) const;
CString GetOptions() const;
CString GetModeArg(unsigned char uMode) const;
@@ -162,6 +164,7 @@
unsigned int m_uBufferCount;
vector<CString> m_vsBuffer;
+ bool m_bModeKnown;
map<unsigned char, CString> m_musModes;
};
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/FileUtils.cpp
^
|
| @@ -194,15 +194,12 @@
}
bool CFile::Delete(const CString& sFileName) {
- if (!CFile::Exists(sFileName)) {
- return false;
- }
-
return (unlink(sFileName.c_str()) == 0) ? true : false;
}
bool CFile::Move(const CString& sOldFileName, const CString& sNewFileName, bool bOverwrite) {
if ((!bOverwrite) && (CFile::Exists(sNewFileName))) {
+ errno = EEXIST;
return false;
}
@@ -211,6 +208,7 @@
bool CFile::Copy(const CString& sOldFileName, const CString& sNewFileName, bool bOverwrite) {
if ((!bOverwrite) && (CFile::Exists(sNewFileName))) {
+ errno = EEXIST;
return false;
}
@@ -250,6 +248,7 @@
bool CFile::Chmod(mode_t mode) {
if (m_iFD == -1) {
+ errno = EBADF;
return false;
}
if (fchmod(m_iFD, mode) != 0) {
@@ -264,17 +263,22 @@
}
bool CFile::Seek(off_t uPos) {
+ /* This sets errno in case m_iFD == -1 */
+ errno = EBADF;
+
if (m_iFD != -1 && lseek(m_iFD, uPos, SEEK_SET) == uPos) {
ClearBuffer();
return true;
}
-
m_bHadError = true;
return false;
}
bool CFile::Truncate() {
+ /* This sets errno in case m_iFD == -1 */
+ errno = EBADF;
+
if (m_iFD != -1 && ftruncate(m_iFD, 0) == 0) {
ClearBuffer();
return true;
@@ -286,6 +290,9 @@
}
bool CFile::Sync() {
+ /* This sets errno in case m_iFD == -1 */
+ errno = EBADF;
+
if (m_iFD != -1 && fsync(m_iFD) == 0)
return true;
m_bHadError = true;
@@ -299,6 +306,7 @@
bool CFile::Open(int iFlags, mode_t iMode) {
if (m_iFD != -1) {
+ errno = EEXIST;
m_bHadError = true;
return false;
}
@@ -324,6 +332,7 @@
int CFile::Read(char *pszBuffer, int iBytes) {
if (m_iFD == -1) {
+ errno = EBADF;
return -1;
}
@@ -338,6 +347,7 @@
int iBytes;
if (m_iFD == -1) {
+ errno = EBADF;
return false;
}
@@ -397,6 +407,7 @@
int CFile::Write(const char *pszBuffer, u_int iBytes) {
if (m_iFD == -1) {
+ errno = EBADF;
return -1;
}
@@ -548,8 +559,10 @@
VCString::iterator it;
// Just in case someone tries this...
- if (sPath.empty())
+ if (sPath.empty()) {
+ errno = ENOENT;
return false;
+ }
// If this is an absolute path, we need to handle this now!
if (sPath.Left(1) == "/")
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/IRCSock.cpp
^
|
| @@ -11,6 +11,7 @@
#include "Client.h"
#include "User.h"
#include "znc.h"
+#include "Server.h"
// These are used in OnGeneralCTCP()
const time_t CIRCSock::m_uCTCPFloodTime = 5;
@@ -161,6 +162,16 @@
ParseISupport(sRest);
m_pUser->UpdateExactRawBuffer(":" + sServer + " " + sCmd + " ", " " + sRest);
break;
+ case 10: { // :irc.server.com 010 nick <hostname> <port> :<info>
+ CString sHost = sRest.Token(0);
+ CString sPort = sRest.Token(1);
+ CString sInfo = sRest.Token(2, true).TrimPrefix_n(":");
+ m_pUser->PutStatus("Server [" + m_pUser->GetCurrentServer()->GetString(false) +
+ "] redirects us to [" + sHost + ":" + sPort + "] with reason [" + sInfo + "]");
+ m_pUser->PutStatus("Perhaps you want to add it as a new server.");
+ // Don't send server redirects to the client
+ return;
+ }
case 2:
case 3:
case 4:
@@ -185,6 +196,15 @@
if (pChan) {
pChan->SetModes(sRest.Token(1, true));
+
+ // We don't SetModeKnown(true) here,
+ // because a 329 will follow
+ if (!pChan->IsModeKnown()) {
+ // When we JOIN, we send a MODE
+ // request. This makes sure the
+ // reply isn't forwarded.
+ return;
+ }
}
}
break;
@@ -195,6 +215,14 @@
if (pChan) {
unsigned long ulDate = sLine.Token(4).ToULong();
pChan->SetCreationDate(ulDate);
+
+ if (!pChan->IsModeKnown()) {
+ pChan->SetModeKnown(true);
+ // When we JOIN, we send a MODE
+ // request. This makes sure the
+ // reply isn't forwarded.
+ return;
+ }
}
}
break;
@@ -441,9 +469,9 @@
m_pUser->AddChan(sChan, false);
pChan = m_pUser->FindChan(sChan);
if (pChan) {
- pChan->ResetJoinTries();
pChan->Enable();
pChan->SetIsOn(true);
+ PutIRC("MODE " + sChan);
}
} else {
pChan = m_pUser->FindChan(sChan);
@@ -779,6 +807,10 @@
if (it != mssCTCPReplies.end()) {
sReply = m_pUser->ExpandString(it->second);
bHaveReply = true;
+
+ if (sReply.empty()) {
+ return true;
+ }
}
if (!bHaveReply && !m_pUser->IsUserAttached()) {
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/Makefile.in
^
|
| @@ -15,7 +15,7 @@
sbindir := @sbindir@
localstatedir := @localstatedir@
CXX := @CXX@
-CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@ -I.
+CXXFLAGS := -I. @CPPFLAGS@ @CXXFLAGS@
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
LIBZNC := @LIBZNC@
@@ -102,11 +102,11 @@
$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
install: znc $(LIBZNC)
- mkdir -p $(DESTDIR)$(bindir)
- mkdir -p $(DESTDIR)$(includedir)/znc
- mkdir -p $(DESTDIR)$(PKGCONFIGDIR)
- mkdir -p $(DESTDIR)$(MODDIR)
- mkdir -p $(DESTDIR)$(DATADIR)
+ test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir)
+ test -d $(DESTDIR)$(includedir)/znc || $(INSTALL) -d $(DESTDIR)$(includedir)/znc
+ test -d $(DESTDIR)$(PKGCONFIGDIR) || $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
+ test -d $(DESTDIR)$(MODDIR) || $(INSTALL) -d $(DESTDIR)$(MODDIR)
+ test -d $(DESTDIR)$(DATADIR) || $(INSTALL) -d $(DESTDIR)$(DATADIR)
cp -R $(srcdir)/webskins $(DESTDIR)$(DATADIR)
find $(DESTDIR)$(DATADIR)/webskins -type d -exec chmod 0755 '{}' \;
find $(DESTDIR)$(DATADIR)/webskins -type f -exec chmod 0644 '{}' \;
@@ -118,7 +118,7 @@
$(INSTALL_DATA) znc.pc $(DESTDIR)$(PKGCONFIGDIR)
@$(MAKE) -C modules install DESTDIR=$(DESTDIR);
if test -n "$(LIBZNC)"; then \
- mkdir -p $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
+ test -d $(DESTDIR)$(LIBZNCDIR) || $(INSTALL) -d $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
$(INSTALL_PROGRAM) $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
fi
@$(MAKE) -C man install DESTDIR=$(DESTDIR)
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/Modules.cpp
^
|
| @@ -411,7 +411,7 @@
void CModule::AddHelpCommand()
{
- AddCommand("Help", &CModule::HandleHelpCommand, "", "Generate this output");
+ AddCommand("Help", &CModule::HandleHelpCommand, "search", "Generate this output");
}
bool CModule::RemCommand(const CString& sCmd)
@@ -445,12 +445,17 @@
}
void CModule::HandleHelpCommand(const CString& sLine) {
+ CString sFilter = sLine.Token(1, true);
+ unsigned int iFilterLength = sFilter.size();
CTable Table;
map<CString, CModCommand>::const_iterator it;
CModCommand::InitHelp(Table);
- for (it = m_mCommands.begin(); it != m_mCommands.end(); ++it)
- it->second.AddHelp(Table);
+ for (it = m_mCommands.begin(); it != m_mCommands.end(); ++it) {
+ if (sFilter.empty() || (it->second.GetCommand().Equals(sFilter, false, iFilterLength))) {
+ it->second.AddHelp(Table);
+ }
+ }
PutModule(Table);
}
@@ -603,7 +608,7 @@
void CModules::UnloadAll() {
while (size()) {
CString sRetMsg;
- CString sModName = (*this)[0]->GetModName();
+ CString sModName = back()->GetModName();
UnloadModule(sModName, sRetMsg);
}
}
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/SHA256.cpp
^
|
| @@ -31,10 +31,10 @@
* SUCH DAMAGE.
*/
-#include <string.h>
-
#include "SHA256.h"
+#include <string.h>
+
#define SHFR(x, n) (x >> n)
#define ROTR(x, n) ((x >> n) | (x << ((sizeof(x) << 3) - n)))
#define ROTL(x, n) ((x << n) | (x >> ((sizeof(x) << 3) - n)))
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/Utils.cpp
^
|
| @@ -34,6 +34,7 @@
X509 *pCert = NULL;
X509_NAME *pName = NULL;
const int days = 365;
+ const int years = 10;
u_int iSeed = time(NULL);
int serial = (rand_r(&iSeed) % 9999);
@@ -55,7 +56,7 @@
X509_set_version(pCert, 2);
ASN1_INTEGER_set(X509_get_serialNumber(pCert), serial);
X509_gmtime_adj(X509_get_notBefore(pCert), 0);
- X509_gmtime_adj(X509_get_notAfter(pCert), (long)60*60*24*days);
+ X509_gmtime_adj(X509_get_notAfter(pCert), (long)60*60*24*days*years);
X509_set_pubkey(pCert, pKey);
pName = X509_get_subject_name(pCert);
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/ZNCString.cpp
^
|
| @@ -902,7 +902,14 @@
return sRet.RightChomp_n();
}
-bool CString::ToBool() const { return (!Trim_n().Trim_n("0").empty() && !Trim_n().Equals("false")); }
+bool CString::ToBool() const {
+ CString sTrimmed = Trim_n();
+ return (!sTrimmed.Trim_n("0").empty() &&
+ !sTrimmed.Equals("false") &&
+ !sTrimmed.Equals("no") &&
+ !sTrimmed.Equals("n"));
+}
+
short CString::ToShort() const { return strtoul(this->c_str(), (char**) NULL, 10); }
unsigned short CString::ToUShort() const { return strtoul(this->c_str(), (char**) NULL, 10); }
unsigned int CString::ToUInt() const { return strtoul(this->c_str(), (char**) NULL, 10); }
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/aclocal.m4
^
|
| @@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/config.guess
^
|
| @@ -2,9 +2,9 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-05-11'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -792,13 +790,12 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -807,6 +804,9 @@
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
@@ -943,7 +953,7 @@
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-tilera-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/config.sub
^
|
| @@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-03-23'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,17 +249,22 @@
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +298,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -300,7 +307,7 @@
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -315,8 +322,7 @@
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -329,7 +335,10 @@
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -352,11 +361,13 @@
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +376,10 @@
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +413,7 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +421,11 @@
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -711,7 +725,6 @@
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -808,10 +821,18 @@
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -1120,13 +1141,8 @@
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1336,7 +1352,7 @@
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1548,9 +1564,6 @@
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for znc 0.202.
+# Generated by GNU Autoconf 2.68 for znc 0.206.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -557,8 +557,8 @@
# Identity of this package.
PACKAGE_NAME='znc'
PACKAGE_TARNAME='znc'
-PACKAGE_VERSION='0.202'
-PACKAGE_STRING='znc 0.202'
+PACKAGE_VERSION='0.206'
+PACKAGE_STRING='znc 0.206'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1243,7 +1243,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures znc 0.202 to adapt to many kinds of systems.
+\`configure' configures znc 0.206 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1308,7 +1308,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of znc 0.202:";;
+ short | recursive ) echo "Configuration of znc 0.206:";;
esac
cat <<\_ACEOF
@@ -1449,7 +1449,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-znc configure 0.202
+znc configure 0.206
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1655,7 +1655,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by znc $as_me 0.202, which was
+It was created by znc $as_me 0.206, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -4588,8 +4588,10 @@
if test "x$USESWIG" != "xno"; then
SWIG_ERROR=""
- # Extract the first word of "swig", so it can be a program name with args.
-set dummy swig; ac_word=$2
+ for ac_prog in swig swig2.0
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_SWIG+:} false; then :
@@ -4628,6 +4630,9 @@
fi
+ test -n "$SWIG" && break
+done
+
if test -z "$SWIG" ; then
SWIG_ERROR='SWIG is not installed. You should look at http://www.swig.org'
elif test -n "1.3.40" ; then
@@ -4988,8 +4993,10 @@
$as_echo "$as_me: python 3.2+ found, requiring newer swig." >&6;}
SWIG_ERROR=""
- # Extract the first word of "swig", so it can be a program name with args.
-set dummy swig; ac_word=$2
+ for ac_prog in swig swig2.0
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_SWIG+:} false; then :
@@ -5028,6 +5035,9 @@
fi
+ test -n "$SWIG" && break
+done
+
if test -z "$SWIG" ; then
SWIG_ERROR='SWIG is not installed. You should look at http://www.swig.org'
elif test -n "2.0.4" ; then
@@ -6010,7 +6020,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by znc $as_me 0.202, which was
+This file was extended by znc $as_me 0.206, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6072,7 +6082,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-znc config.status 0.202
+znc config.status 0.206
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -6791,7 +6801,7 @@
echo
-echo znc 0.202 configured
+echo znc 0.206 configured
echo
echo "prefix: $prefix"
echo "debug: $DEBUG"
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/configure.ac
^
|
| @@ -1,7 +1,7 @@
dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62
AC_PREREQ([2.62])
dnl Keep the version number in sync with main.h!
-AC_INIT([znc], [0.202])
+AC_INIT([znc], [0.206])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([znc.cpp])
AC_LANG([C++])
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/install-sh
^
|
| @@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
shift;;
-T) no_target_directory=true;;
@@ -186,6 +190,10 @@
fi
shift # arg
dst_arg=$arg
+ # Protect names problematic for `test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
done
fi
@@ -200,7 +208,11 @@
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
for src
do
- # Protect names starting with `-'.
+ # Protect names problematic for `test' and other utilities.
case $src in
- -*) src=./$src;;
+ -* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
echo "$0: no destination specified." >&2
exit 1
fi
-
dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
@@ -385,7 +392,7 @@
case $dstdir in
/*) prefix='/';;
- -*) prefix='./';;
+ [-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
@@ -403,7 +410,7 @@
for d
do
- test -z "$d" && continue
+ test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/m4/ac_pkg_swig.m4
^
|
| @@ -1,5 +1,7 @@
dnl @synopsis AC_PROG_SWIG([major.minor.micro])
dnl
+dnl NOTICE: for new code, use http://www.gnu.org/s/autoconf-archive/ax_pkg_swig.html instead.
+dnl
dnl This macro searches for a SWIG installation on your system. If
dnl found you should call SWIG via $(SWIG). You can use the optional
dnl first argument to check if the version of the available SWIG is
@@ -26,10 +28,12 @@
dnl
dnl Modified by Alexey Sokolov <alexey@alexeysokolov.co.cc> on 2011-05-06
dnl @license GPLWithACException
+dnl
+dnl NOTICE: for new code, use http://www.gnu.org/s/autoconf-archive/ax_pkg_swig.html instead.
AC_DEFUN([AC_PROG_SWIG],[
SWIG_ERROR=""
- AC_PATH_PROG([SWIG],[swig])
+ AC_PATH_PROGS([SWIG],[swig swig2.0])
if test -z "$SWIG" ; then
dnl AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
SWIG_ERROR='SWIG is not installed. You should look at http://www.swig.org'
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/main.h
^
|
| @@ -13,7 +13,7 @@
// The following defines are for #if comparison (preprocessor only likes ints)
#define VERSION_MAJOR 0
-#define VERSION_MINOR 202
+#define VERSION_MINOR 206
// This one is for display purpose
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 1000.0)
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/man/Makefile.in
^
|
| @@ -34,7 +34,7 @@
-rm -f $(MAN1)
install: $(MAN1)
- mkdir -p $(DESTDIR)$(mandir)/man1
+ test -d $(DESTDIR)$(mandir)/man1 || $(INSTALL) -d $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1
uninstall:
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/Makefile.in
^
|
| @@ -17,7 +17,7 @@
localstatedir := @localstatedir@
CXX := @CXX@
# CXXFLAGS are for the main binary, so don't use them here, use MODFLAGS instead
-MODFLAGS := @DEFS@ @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/.. -I..
+MODFLAGS := -I$(srcdir)/.. -I.. @CPPFLAGS@ @MODFLAGS@
MODLINK := @MODLINK@
LDFLAGS := @LDFLAGS@
# LIBS are not and should not be used in here.
@@ -101,10 +101,9 @@
install_datadir:
rm -rf $(DESTDIR)$(DATADIR)/modules
- mkdir -p $(DESTDIR)$(MODDIR)
- mkdir -p $(DESTDIR)$(DATADIR)/modules
+ test -d $(DESTDIR)$(MODDIR) || $(INSTALL) -d $(DESTDIR)$(MODDIR)
+ test -d $(DESTDIR)$(DATADIR)/modules || $(INSTALL) -d $(DESTDIR)$(DATADIR)/modules
rm -rf $(DESTDIR)$(MODDIR)/*.so
- mkdir -p $(DESTDIR)$(DATADIR)/modules
cp -R $(srcdir)/data/* $(DESTDIR)$(DATADIR)/modules
if test "@EXTRA@" = "yes" ; then \
cp -R $(srcdir)/extra/data/* $(DESTDIR)$(DATADIR)/modules ; \
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/admin.cpp
^
|
| @@ -861,4 +861,4 @@
Info.SetWikiPage("admin");
}
-MODULEDEFS(CAdminMod, "Dynamic configuration of users/settings through IRC")
+MODULEDEFS(CAdminMod, "Dynamic configuration of users/settings through IRC. Allows editing only yourself if you're not ZNC admin.")
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/autoreply.cpp
^
|
| @@ -58,11 +58,6 @@
PutIRC("PRIVMSG " + sNick + " :" + GetReply());
}
- virtual EModRet OnPrivNotice(CNick& Nick, CString& sMessage) {
- Handle(Nick.GetNick());
- return CONTINUE;
- }
-
virtual EModRet OnPrivMsg(CNick& Nick, CString& sMessage) {
Handle(Nick.GetNick());
return CONTINUE;
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/bouncedcc.cpp
^
|
| @@ -238,7 +238,7 @@
CDCCBounce* pSock = (CDCCBounce*) *it;
if (pSock->GetLocalPort() == uResumePort) {
- m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001");
+ m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetUserPort()) + " " + sMessage.Token(4) + "\001");
}
}
} else if (sType.Equals("ACCEPT")) {
@@ -248,7 +248,7 @@
CDCCBounce* pSock = (CDCCBounce*) *it;
if (pSock->GetUserPort() == sMessage.Token(3).ToUShort()) {
- m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pClient->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001");
+ m_pUser->PutUser(":" + Nick.GetNickMask() + " PRIVMSG " + m_pUser->GetNick() + " :\001DCC " + sType + " " + sFile + " " + CString(pSock->GetLocalPort()) + " " + sMessage.Token(4) + "\001");
}
}
}
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/cert.cpp
^
|
| @@ -29,7 +29,7 @@
} else {
PutModule("You do not have a certificate. Please use the web interface to add a certificate");
if (m_pUser->IsAdmin()) {
- PutModule("Alternatively you can either place one at " + PemFile() + " or use the GENERATE command to generate a new certificate");
+ PutModule("Alternatively you can either place one at " + PemFile());
}
}
}
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/identfile.cpp
^
|
| @@ -25,6 +25,10 @@
AddCommand("GetFormat", static_cast<CModCommand::ModCmdFunc>(&CIdentFileModule::GetFormat));
AddCommand("SetFormat", static_cast<CModCommand::ModCmdFunc>(&CIdentFileModule::SetFormat),
"<format>");
+ AddCommand("Show", static_cast<CModCommand::ModCmdFunc>(&CIdentFileModule::Show));
+
+ m_pISpoofLockFile = NULL;
+ m_pIRCSock = NULL;
}
virtual ~CIdentFileModule() {
@@ -51,6 +55,14 @@
PutModule("Format would be expanded to: " + m_pUser->ExpandString(GetNV("Format")));
}
+ void Show(const CString& sLine) {
+ PutModule("m_pISpoofLockFile = " + CString((long long)m_pISpoofLockFile));
+ PutModule("m_pIRCSock = " + CString((long long)m_pIRCSock));
+ if (m_pIRCSock) {
+ PutModule("user = " + m_pIRCSock->GetUser()->GetUserName());
+ }
+ }
+
void OnModCommand(const CString& sCommand) {
if (m_pUser->IsAdmin()) {
HandleCommand(sCommand);
@@ -98,6 +110,10 @@
}
void ReleaseISpoof() {
+ DEBUG("Releasing ident spoof for user [" + (m_pUser ? m_pUser->GetUserName() : "<no user>") + "]");
+
+ m_pIRCSock = NULL;
+
if (m_pISpoofLockFile != NULL) {
if (m_pISpoofLockFile->Seek(0) && m_pISpoofLockFile->Truncate()) {
m_pISpoofLockFile->Write(m_sOrigISpoof);
@@ -142,21 +158,18 @@
virtual void OnIRCConnected() {
if (m_pIRCSock == m_pUser->GetIRCSock()) {
- m_pIRCSock = NULL;
ReleaseISpoof();
}
}
virtual void OnIRCConnectionError(CIRCSock *pIRCSock) {
if (m_pIRCSock == pIRCSock) {
- m_pIRCSock = NULL;
ReleaseISpoof();
}
}
virtual void OnIRCDisconnected() {
if (m_pIRCSock == m_pUser->GetIRCSock()) {
- m_pIRCSock = NULL;
ReleaseISpoof();
}
}
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/modperl/modperl.i
^
|
| @@ -13,6 +13,9 @@
#ifdef Pause
# undef Pause
#endif
+#ifdef seed
+# undef seed
+#endif
#include <utility>
#include "../Utils.h"
#include "../Socket.h"
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/modules/route_replies.cpp
^
|
| @@ -117,6 +117,8 @@
// Since there should never be more than one of these going on, this
// should work fine and makes the code simpler.
{"MODE", {
+ // "You're not a channel operator"
+ {"482", true},
// MODE I
{"346", false},
{"347", true},
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/test/Makefile.in
^
|
| @@ -5,7 +5,7 @@
VPATH := @srcdir@
CXX := @CXX@
-CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@ -I..
+CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I..
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/znc-config.in
^
|
| @@ -7,7 +7,7 @@
datadir="@datadir@"
CXX="@CXX@"
-CXXFLAGS="@DEFS@ @CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
+CXXFLAGS="@CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
MODLINK="@MODLINK@"
# LIBS="@LIBS@"
# No libs needed, ZNC links against $LIBS and thus modules don't need to.
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/znc-uninstalled.pc.in
^
|
| @@ -7,7 +7,6 @@
includedir=@includedir@
cxx=@CXX@
-DEFS=@DEFS@
CPPFLAGS=@CPPFLAGS@
MODFLAGS=@MODFLAGS@
version=@PACKAGE_VERSION@
@@ -23,4 +22,4 @@
Description: An advanced IRC proxy
Version: ${version}
URL: http://znc.in
-Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
+Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/znc.cpp
^
|
| @@ -589,7 +589,7 @@
do {
bSuccess = true;
- while (!CUtils::GetNumInput("What port would you like ZNC to listen on?", uListenPort, 1, 65535)) ;
+ while (!CUtils::GetNumInput("What port would you like ZNC to listen on?", uListenPort, 1025, 65535)) ;
#ifdef HAVE_LIBSSL
if (CUtils::GetBoolInput("Would you like ZNC to listen using SSL?", !sSSL.empty())) {
|
|
[-]
[+]
|
Changed |
znc-0.206.tar.bz2/znc.pc.in
^
|
| @@ -7,7 +7,6 @@
includedir=@includedir@
cxx=@CXX@
-DEFS=@DEFS@
CPPFLAGS=@CPPFLAGS@
MODFLAGS=@MODFLAGS@
version=@PACKAGE_VERSION@
@@ -21,4 +20,4 @@
Description: An advanced IRC proxy
Version: ${version}
URL: http://znc.in
-Cflags: ${DEFS} ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
+Cflags: ${CPPFLAGS} ${MODFLAGS} ${INC_PATH}
|
