* [gentoo-commits] gentoo-x86 commit in net-irc/anope/files: anope-1.8.7-libdir-gentoo.patch anope-init.d anope-1.8.7-ldflags-fix.patch anope-conf.d ldflags-fix.patch anope.confd anope.initd
@ 2011-12-28 20:25 Bjarke Istrup Pedersen (gurligebis)
0 siblings, 0 replies; only message in thread
From: Bjarke Istrup Pedersen (gurligebis) @ 2011-12-28 20:25 UTC (permalink / raw
To: gentoo-commits
gurligebis 11/12/28 20:25:48
Added: anope-1.8.7-libdir-gentoo.patch anope-init.d
anope-1.8.7-ldflags-fix.patch anope-conf.d
Removed: ldflags-fix.patch anope.confd anope.initd
Log:
Bumping to 1.8.7, removing old version and moving out of /opt.
Thanks to everybody who helped out. Fixing bug #395089
(Portage version: 2.2.0_alpha83/cvs/Linux i686)
Revision Changes Path
1.1 net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch?rev=1.1&content-type=text/plain
Index: anope-1.8.7-libdir-gentoo.patch
===================================================================
--- configure.in
+++ configure.in
@@ -286,6 +286,15 @@
])
AC_SUBST(DATDEST)
+
+AC_ARG_WITH(libdir, [ --with-libdir=libdir Specify the location of the services lib folder], [
+ AC_DEFINE_UNQUOTED(LIB_DIR,"$withval","services lib dir")
+ AC_DEFINE_UNQUOTED(MODULE_PATH,"${withval}/modules/","Module dir")
+ DATDEST=$withval
+ MODULE_PATH=${withval}/modules/
+])
+
+AC_SUBST(LIB_PATH)
AC_SUBST(MODULE_PATH)
AC_CONFIG_FILES( \
--- src/Makefile
+++ src/Makefile
@@ -115,10 +115,6 @@
ln $(BINDEST)/services $(BINDEST)/listnicks
ln $(BINDEST)/services $(BINDEST)/listchans
(cd ../lang ; $(MAKE) install)
- $(CP) ../data/* $(DATDEST)
- $(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
- test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
- test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
@if [ "$(MODULE_PATH)" ] ; then \
test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
--- include/sysconf.h.in
+++ include/sysconf.h.in
@@ -96,6 +96,9 @@
/* "Module dir" */
#undef MODULE_PATH
+/* "Lib dir" */
+#undef LIB_DIR
+
/* "Has mysql/mysql.h" */
#undef MYSQL_HEADER_PREFIX
--- include/config.h
+++ include/config.h
@@ -22,10 +22,10 @@
/******* General configuration *******/
/* Name of configuration file (in Services directory) */
-#define SERVICES_CONF "services.conf"
+#define SERVICES_CONF "/etc/anope/services.conf"
/* Name of log file (in Services directory) */
-#define LOG_FILENAME "services.log"
+#define LOG_FILENAME "/var/log/anope/services.log"
/* Maximum amount of data from/to the network to buffer (bytes). */
#define NET_BUFSIZE 65536
--- src/log.c
+++ src/log.c
@@ -33,7 +33,7 @@
/* fix bug 577 */
strftime(timestamp, sizeof(timestamp), "%Y%m%d", tm);
- snprintf(name, count, "logs/%s.%s", log_filename, timestamp);
+ snprintf(name, count, "%s.%s", log_filename, timestamp);
curday = tm->tm_yday;
return 1;
--- src/modules.c
+++ src/modules.c
@@ -2846,7 +2846,7 @@
#ifndef _WIN32
- snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", services_dir);
+ snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", LIB_DIR);
#else
snprintf(dirbuf, BUFSIZE, "\\%s", "modules/runtime");
#endif
--- src/language.c
+++ src/language.c
@@ -71,7 +71,7 @@
alog("debug: Loading language %d from file `languages/%s'",
index, filename);
}
- snprintf(buf, sizeof(buf), "languages/%s", filename);
+ snprintf(buf, sizeof(buf), "%s/languages/%s", LIB_DIR, filename);
#ifndef _WIN32
if (!(f = fopen(buf, "r"))) {
#else
1.1 net-irc/anope/files/anope-init.d
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-init.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-init.d?rev=1.1&content-type=text/plain
Index: anope-init.d
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/files/anope-init.d,v 1.1 2011/12/28 20:25:48 gurligebis Exp $
extra_started_commands="reload"
depend() {
use net mysql ircd
provide irc-services
}
start() {
ebegin "Starting Anope IRC Services"
start-stop-daemon --start --exec /usr/bin/services \
--user ${ANOPE_USER} --pidfile /var/run/anope/services.pid \
-- ${ANOPE_OPTS}
eend $?
}
stop() {
ebegin "Stopping Anope IRC Services"
start-stop-daemon --stop --pidfile /var/run/anope/services.pid
eend $?
}
reload() {
ebegin "Reloading Anope IRC Services"
start-stop-daemon --signal USR2 --exec /usr/bin/services \
--pidfile /var/run/anope/services.pid
eend $?
}
1.1 net-irc/anope/files/anope-1.8.7-ldflags-fix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch?rev=1.1&content-type=text/plain
Index: anope-1.8.7-ldflags-fix.patch
===================================================================
diff -aurp a/src/core/Makefile b/src/core/Makefile
--- a/src/core/Makefile 2010-10-10 19:55:31.396999906 +0000
+++ b/src/core/Makefile 2010-10-10 19:53:54.877001245 +0000
@@ -24,7 +24,7 @@ distclean: spotless
$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
@$(TOUCH) $*.s
subs:
diff -aurp a/src/modules/Makefile b/src/modules/Makefile
--- a/src/modules/Makefile 2010-10-10 19:55:32.486000023 +0000
+++ b/src/modules/Makefile 2010-10-10 19:54:07.240000026 +0000
@@ -27,7 +27,7 @@ distclean: spotless
$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
@$(TOUCH) $*.s
subs:
diff -aurp a/src/protocol/Makefile b/src/protocol/Makefile
--- a/src/protocol/Makefile 2010-10-10 19:55:33.605002302 +0000
+++ b/src/protocol/Makefile 2010-10-10 19:54:19.271997806 +0000
@@ -24,7 +24,7 @@ distclean: clean spotless
$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
@$(TOUCH) $*.s
subs:
--- a/src/tools/Makefile 2011-12-28 20:00:00.646427623 +0000
+++ b/src/tools/Makefile 2011-12-28 20:00:41.030430806 +0000
@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}'
'RUNGROUP=${RUNGROUP}'
.c.o:
- $(CC) $(CFLAGS) -I../include/ $< -o $*
+ $(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
all: ${OBJS}
1.1 net-irc/anope/files/anope-conf.d
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-conf.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-conf.d?rev=1.1&content-type=text/plain
Index: anope-conf.d
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/files/anope-conf.d,v 1.1 2011/12/28 20:25:48 gurligebis Exp $
# user to run ultimate-ircd as
ANOPE_USER="anope"
# Additional commandline parameters
ANOPE_OPTS=""
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-28 20:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-28 20:25 [gentoo-commits] gentoo-x86 commit in net-irc/anope/files: anope-1.8.7-libdir-gentoo.patch anope-init.d anope-1.8.7-ldflags-fix.patch anope-conf.d ldflags-fix.patch anope.confd anope.initd Bjarke Istrup Pedersen (gurligebis)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox