| 1 |
nimiux 12/04/04 11:52:38 |
| 2 |
|
| 3 |
Added: inspircd-2.0.5-r2-fix-paths-build.patch |
| 4 |
Log: |
| 5 |
Revision bump to include inspircd moving to github.com, fixes to problems |
| 6 |
detectect in previous revision (bug #409159, comments 10 and 13) and |
| 7 |
fix for bug #410285. |
| 8 |
|
| 9 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-irc/inspircd/files/inspircd-2.0.5-r2-fix-paths-build.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.5-r2-fix-paths-build.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.5-r2-fix-paths-build.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: inspircd-2.0.5-r2-fix-paths-build.patch |
| 18 |
=================================================================== |
| 19 |
diff -Nur a/docs/inspircd.conf.example b/docs/inspircd.conf.example |
| 20 |
--- a/docs/inspircd.conf.example 2011-06-24 03:21:01.000000000 +0200 |
| 21 |
+++ b/docs/inspircd.conf.example 2012-04-03 19:09:59.649826121 +0200 |
| 22 |
@@ -401,11 +401,11 @@ |
| 23 |
|
| 24 |
# This file has all the information about oper classes, types and o:lines. |
| 25 |
# You *MUST* edit it. |
| 26 |
-<include file="conf/opers.conf.example"> |
| 27 |
+<include file="/etc/inspircd/opers.conf.example"> |
| 28 |
|
| 29 |
# This file has all the information about server links and ulined servers. |
| 30 |
# You *MUST* edit it if you intend to link servers. |
| 31 |
-<include file="conf/links.conf.example"> |
| 32 |
+<include file="/etc/inspircd/links.conf.example"> |
| 33 |
|
| 34 |
#-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# |
| 35 |
# # |
| 36 |
@@ -415,7 +415,8 @@ |
| 37 |
# motd - displayed on connect and when a user executes /MOTD |
| 38 |
# rules - displayed when the user executes /RULES |
| 39 |
# Modules can also define their own files |
| 40 |
-<files motd="conf/inspircd.motd.example" rules="conf/inspircd.rules.example"> |
| 41 |
+<files motd="/etc/inspircd/inspircd.motd.example" |
| 42 |
+ rules="/etc/inspircd/inspircd.rules.example"> |
| 43 |
|
| 44 |
# Example of an executable file include. Note this will be read on rehash, |
| 45 |
# not when the command is run. |
| 46 |
@@ -461,7 +462,7 @@ |
| 47 |
# the default of 'inspircd.pid' is used. # |
| 48 |
# # |
| 49 |
|
| 50 |
-#<pid file="/path/to/inspircd.pid"> |
| 51 |
+<pid file="/var/run/inspircd/inspircd.pid"> |
| 52 |
|
| 53 |
#-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
| 54 |
# # |
| 55 |
@@ -629,7 +630,8 @@ |
| 56 |
|
| 57 |
# nouserdns: If enabled, no DNS lookups will be performed on |
| 58 |
# connecting users. This can save a lot of resources on very busy servers. |
| 59 |
- nouserdns="no"> |
| 60 |
+ # Set nouserdns to yes as a workaround for CVE-2012-1836. |
| 61 |
+ nouserdns="yes"> |
| 62 |
|
| 63 |
#-#-#-#-#-#-#-#-#-#-#-# SECURITY CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# |
| 64 |
# # |
| 65 |
@@ -907,7 +909,7 @@ |
| 66 |
# provide almost all the features of InspIRCd. :) # |
| 67 |
# # |
| 68 |
# The default does nothing -- we include it for simplicity for you. # |
| 69 |
-<include file="conf/modules.conf.example"> |
| 70 |
+<include file="/etc/inspircd/modules.conf.example"> |
| 71 |
|
| 72 |
# Here are some pre-built modules.conf files that closely match the |
| 73 |
# default configurations of some popular IRCd's. You still may want to |
| 74 |
@@ -919,10 +921,10 @@ |
| 75 |
# recommended that you make your own modules file based on modules.conf.example. |
| 76 |
|
| 77 |
# Settings similar to UnrealIRCd defaults. |
| 78 |
-#<include file="conf/modules/modules.conf.unreal"> |
| 79 |
+#<include file="/etc/inspircd/modules/modules.conf.unreal"> |
| 80 |
|
| 81 |
# Settings similar to Charybdis IRCd defaults. |
| 82 |
-#<include file="conf/modules/modules.conf.charybdis"> |
| 83 |
+#<include file="/etc/inspircd/modules/modules.conf.charybdis"> |
| 84 |
|
| 85 |
|
| 86 |
######################################################################### |
| 87 |
diff -Nur a/make/template/main.mk b/make/template/main.mk |
| 88 |
--- a/make/template/main.mk 2011-06-24 03:21:01.000000000 +0200 |
| 89 |
+++ b/make/template/main.mk 2012-04-03 19:09:59.649826121 +0200 |
| 90 |
@@ -54,22 +54,22 @@ |
| 91 |
CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include |
| 92 |
@ENDIF |
| 93 |
|
| 94 |
-@IFNDEF D |
| 95 |
- D=0 |
| 96 |
+@IFNDEF DEBUGLEVEL |
| 97 |
+ DEBUGLEVEL=0 |
| 98 |
@ENDIF |
| 99 |
|
| 100 |
DBGOK=0 |
| 101 |
-@IFEQ $(D) 0 |
| 102 |
+@IFEQ $(DEBUGLEVEL) 0 |
| 103 |
CXXFLAGS += -O2 -g1 |
| 104 |
HEADER = std-header |
| 105 |
DBGOK=1 |
| 106 |
@ENDIF |
| 107 |
-@IFEQ $(D) 1 |
| 108 |
+@IFEQ $(DEBUGLEVEL) 1 |
| 109 |
CXXFLAGS += -O0 -g3 -Werror |
| 110 |
HEADER = debug-header |
| 111 |
DBGOK=1 |
| 112 |
@ENDIF |
| 113 |
-@IFEQ $(D) 2 |
| 114 |
+@IFEQ $(DEBUGLEVEL) 2 |
| 115 |
CXXFLAGS += -O2 -g3 |
| 116 |
HEADER = debug-header |
| 117 |
DBGOK=1 |
| 118 |
@@ -111,10 +111,10 @@ |
| 119 |
@GNU_ONLY TARGET = modules/$(M:.so=).so |
| 120 |
@ENDIF |
| 121 |
|
| 122 |
-@IFDEF T |
| 123 |
+@IFDEF TGT |
| 124 |
HEADER = |
| 125 |
FOOTER = target |
| 126 |
- TARGET = $(T) |
| 127 |
+ TARGET = $(TGT) |
| 128 |
@ENDIF |
| 129 |
|
| 130 |
@IFEQ $(DBGOK) 0 |
| 131 |
diff -Nur a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp |
| 132 |
--- a/src/modules/extra/m_ssl_gnutls.cpp 2011-06-24 03:21:01.000000000 +0200 |
| 133 |
+++ b/src/modules/extra/m_ssl_gnutls.cpp 2012-04-03 19:09:59.649826121 +0200 |
| 134 |
@@ -20,7 +20,7 @@ |
| 135 |
|
| 136 |
/* $ModDesc: Provides SSL support for clients */ |
| 137 |
/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */ |
| 138 |
-/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */ |
| 139 |
+/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") -lgcrypt */ |
| 140 |
|
| 141 |
enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED }; |
| 142 |
|
| 143 |
diff -Nur a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp |
| 144 |
--- a/src/modules/m_xline_db.cpp 2011-06-24 03:21:01.000000000 +0200 |
| 145 |
+++ b/src/modules/m_xline_db.cpp 2012-04-03 19:11:38.389825566 +0200 |
| 146 |
@@ -92,7 +92,7 @@ |
| 147 |
* -- w00t |
| 148 |
*/ |
| 149 |
ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database"); |
| 150 |
- f = fopen("data/xline.db.new", "w"); |
| 151 |
+ f = fopen("/var/lib/inspircd/data/xline.db.new", "w"); |
| 152 |
if (!f) |
| 153 |
{ |
| 154 |
ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno); |
| 155 |
@@ -133,7 +133,7 @@ |
| 156 |
} |
| 157 |
|
| 158 |
// Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash. |
| 159 |
- if (rename("data/xline.db.new", "data/xline.db") < 0) |
| 160 |
+ if (rename("/var/lib/inspircd/data/xline.db.new", "/var/lib/inspircd/data/xline.db") < 0) |
| 161 |
{ |
| 162 |
ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno); |
| 163 |
ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno); |
| 164 |
@@ -149,7 +149,7 @@ |
| 165 |
char linebuf[MAXBUF]; |
| 166 |
unsigned int lineno = 0; |
| 167 |
|
| 168 |
- f = fopen("data/xline.db", "r"); |
| 169 |
+ f = fopen("/var/lib/inspircd/data/xline.db", "r"); |
| 170 |
if (!f) |
| 171 |
{ |
| 172 |
if (errno == ENOENT) |
Archives