* [gentoo-commits] gentoo-x86 commit in net-irc/ultimate/files: ultimate-3.0.2-system-zlib.patch ultimate-3.0.2-entropy-path.patch ultimate-3.0.2-make-failfast.patch ultimateircd.rc.2 ultimate-3.0.2-open-mode.patch ultimate-3.0.2-config.patch.in ultimateircd.conf.2
@ 2011-05-02 20:43 Diego Petteno (flameeyes)
0 siblings, 0 replies; only message in thread
From: Diego Petteno (flameeyes) @ 2011-05-02 20:43 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/05/02 20:43:45
Added: ultimate-3.0.2-system-zlib.patch
ultimate-3.0.2-entropy-path.patch
ultimate-3.0.2-make-failfast.patch
ultimateircd.rc.2 ultimate-3.0.2-open-mode.patch
ultimate-3.0.2-config.patch.in ultimateircd.conf.2
Log:
Revision bump by Nathan Phillip Brink, who's the new proxied maintainer for the package. Fixes bugs #251434 and 364957.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.1 net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-system-zlib.patch?rev=1.1&content-type=text/plain
Index: ultimate-3.0.2-system-zlib.patch
===================================================================
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Subject: Don't compile against internal zlib. Missing ./configure.ac
changes because ./configure.ac wasn't shipped with the dist
tarball.
Date: 2011/04/27
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -702,6 +702,8 @@
wi_ARG_DISABLE_CCDV
wi_PROG_CCDV
+PKG_CHECK_MODULES([ZLIB], [zlib])
+
AC_SUBST(SSL_INCLUDES)
AC_SUBST(SSL_LIBS)
AC_SUBST(ENCRYPT_SRC)
@@ -716,7 +718,7 @@
AC_SUBST(SEDOBJ)
AC_SUBST(CCDV)
-AC_OUTPUT(Makefile data/Makefile data/networks/Makefile src/Makefile tools/Makefile tools/ircdcron/Makefile tools/ssl-cert/Makefile zlib/Makefile)
+AC_OUTPUT(Makefile data/Makefile data/networks/Makefile src/Makefile tools/Makefile tools/ircdcron/Makefile tools/ssl-cert/Makefile)
echo
echo =================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,3 +28,3 @@
SHELL=/bin/sh
-SUBDIRS=zlib src tools data @SUBDIR_MESSAGES@
+SUBDIRS = src tools data @SUBDIR_MESSAGES@
SUBDIRS2=data/networks tools/ircdcron tools/ssl-cert
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,9 +53,9 @@
SSL_LIBS = @SSL_LIBS@
SSL_INCLUDES = @SSL_INCLUDES@
-IRCDLIBS = ../zlib/libz.a @LIBS@ $(SSL_LIBS)
+IRCDLIBS = $(ZLIB_LIBS) @LIBS@ $(SSL_LIBS)
-INCLUDES = -I../include -I../zlib $(SSL_INCLUDES)
+INCLUDES = -I../include $(ZLIB_CFLAGS) $(SSL_INCLUDES)
CPPFLAGS = ${INCLUDES} @CPPFLAGS@
default: all
1.1 net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch?rev=1.1&content-type=text/plain
Index: ultimate-3.0.2-entropy-path.patch
===================================================================
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Subject: Store and retrieve entropy from a file in a directory
writable/readable by ultimateircd.
Date: 2011/04/28
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,7 +32,7 @@
LEX = @LEX@
LEXLIB = @LEXLIB@
CCDV = @CCDV@
-CFLAGS = @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\"
+CFLAGS = @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\" -DLOCALSTATEDIR='"$(localstatedir)"'
LDFLAGS = @LDFLAGS@
MKDEP = @MKDEP@ -DIRCD_PREFIX=\"@prefix@\"
MV = @MV@
--- a/src/dh.c
+++ b/src/dh.c
@@ -214,10 +214,10 @@
printf ("Done.\n");
fclose (fp);
- fp = fopen (".ircd.entropy", "w");
+ fp = fopen (LOCALSTATEDIR "/.ircd.entropy", "w");
if (!fp)
{
- printf ("Could not open .ircd.entropy for writing: %s\n",
+ printf ("Could not open " LOCALSTATEDIR "/.ircd.entropy for writing: %s\n",
strerror (errno));
return 0;
}
@@ -225,7 +225,7 @@
fwrite (randbuf, RAND_BYTES * 4, 1, fp);
fclose (fp);
- RAND_load_file (".ircd.entropy", -1);
+ RAND_load_file (LOCALSTATEDIR "/.ircd.entropy", -1);
return 1;
}
@@ -236,7 +236,7 @@
int ret;
time_t now;
- ret = RAND_load_file (".ircd.entropy", -1);
+ ret = RAND_load_file (LOCALSTATEDIR "/.ircd.entropy", -1);
if (ret <= 0)
{
if (!make_entropy ())
@@ -250,7 +250,7 @@
/* this is probably not too good, but it saves just writing
the whole state back to disk with no changes. */
RAND_seed (&now, 4);
- RAND_write_file (".ircd.entropy");
+ RAND_write_file (LOCALSTATEDIR "/.ircd.entropy");
return 0;
}
1.1 net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch?rev=1.1&content-type=text/plain
Index: ultimate-3.0.2-make-failfast.patch
===================================================================
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Subject: Cause build failures to be fail-fast instead of going undetected.
Date: 2011/04/27
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@
@for i in $(SUBDIRS); do \
echo "Building $$i";\
cd $$i;\
- ${MAKE} build; cd ..;\
+ ${MAKE} build || exit 1; cd ..;\
done
@echo ' '
@echo '================================================================='
@@ -62,7 +62,7 @@
@for i in $(SUBDIRS); do \
echo "Building $$i [profile]";\
cd $$i;\
- ${MAKEPROFILE} build; cd ..;\
+ ${MAKEPROFILE} build || exit 1; cd ..;\
done
clean:
@@ -70,7 +70,7 @@
@for i in $(SUBDIRS); do \
echo "Cleaning $$i";\
cd $$i;\
- ${MAKE} clean; cd ..;\
+ ${MAKE} clean || exit 1; cd ..;\
done
-@if [ -f include/setup.h ] ; then \
echo "To really restart installation, make distclean" ; \
@@ -83,28 +83,28 @@
@for i in $(SUBDIRS); do \
echo "Cleaning $$i";\
cd $$i;\
- ${MAKE} distclean; cd ..;\
+ ${MAKE} distclean || exit 1; cd ..;\
done
depend:
@for i in $(SUBDIRS); do \
echo "depend ==> $$i";\
cd $$i;\
- ${MAKE} depend; cd ..;\
+ ${MAKE} depend || exit 1; cd ..;\
done
install: all
@for i in $(SUBDIRS); do \
echo "install ==> $$i";\
cd $$i;\
- ${MAKE} install; \
+ ${MAKE} install || exit 1; \
cd ..; \
done
@for i in $(SUBDIRS2); do \
echo "install ==> $$i";\
cd $$i;\
- ${MAKE} install; \
+ ${MAKE} install || exit 1; \
cd ../../; \
done
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -68,6 +68,7 @@
build: all
+depend:
mkpasswd: $(mkpasswd_OBJECTS)
$(CCDV)$(CC) ${CFLAGS} ${LDFLAGS} -o mkpasswd $(mkpasswd_OBJECTS) $(IRCDLIBS)
1.1 net-irc/ultimate/files/ultimateircd.rc.2
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc.2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc.2?rev=1.1&content-type=text/plain
Index: ultimateircd.rc.2
===================================================================
#!/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/ultimate/files/ultimateircd.rc.2,v 1.1 2011/05/02 20:43:45 flameeyes Exp $
depend() {
use dns net
}
start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start --quiet --exec /usr/bin/ultimateircd \
--chuid ${ULTIMATEIRCD_USER}
eend $?
}
stop() {
ebegin "Shutting down ${SVCNAME}"
start-stop-daemon --stop --pidfile /var/run/ultimateircd/ircd.pid
eend $?
}
1.1 net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch?rev=1.1&content-type=text/plain
Index: ultimate-3.0.2-open-mode.patch
===================================================================
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
Subject: Provide the required third argument to open() when O_CREAT is
in the second argument.
Date: 2011/04/28
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -4603,7 +4603,7 @@
#else /* LOCKFILE - MDP */
- if ((out = open (filename, O_RDWR | O_APPEND | O_CREAT)) == -1)
+ if ((out = open (filename, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
{
sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
me.name, parv[0], filename);
@@ -7397,7 +7397,7 @@
syslog (LOG_INFO, "ADDCNLINE from %s for [%s] - Opening %s\n",
get_client_name (source_p, FALSE), parv[3], configfile);
#endif
- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
{
sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
me.name, parv[0], configfile);
@@ -7770,7 +7770,7 @@
syslog (LOG_INFO, "ADDOPER from %s for [%s] - Opening %s\n",
get_client_name (source_p, FALSE), parv[3], configfile);
#endif
- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
{
sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
me.name, parv[0], configfile);
@@ -8090,7 +8090,7 @@
syslog (LOG_INFO, "ADDQLINE from %s for [%s] - Opening %s\n",
get_client_name (source_p, FALSE), parv[1], configfile);
#endif
- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
{
sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
me.name, parv[0], configfile);
@@ -8379,7 +8379,7 @@
syslog (LOG_INFO, "ADDHLINE from %s for [%s] - Opening %s\n",
get_client_name (source_p, FALSE), parv[1], configfile);
#endif
- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
{
sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
me.name, parv[0], configfile);
@@ -8663,7 +8663,7 @@
syslog (LOG_INFO, "ADDULINE from %s for [%s] - Opening %s\n",
get_client_name (source_p, FALSE), parv[1], configfile);
#endif
- if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
+ if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
{
sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
me.name, parv[0], configfile);
Diff finished. Thu Apr 28 00:15:19 2011
1.1 net-irc/ultimate/files/ultimate-3.0.2-config.patch.in
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in?rev=1.1&content-type=text/plain
Index: ultimate-3.0.2-config.patch.in
===================================================================
diff -Nur Ultimate3.0.0.rc2.orig/include/config.h Ultimate3.0.0.rc2/include/config.h
--- Ultimate3.0.0.rc2.orig/include/config.h 2005-01-30 15:01:45.677952244 +0100
+++ Ultimate3.0.0.rc2/include/config.h 2005-01-30 15:02:43.353895511 +0100
@@ -127,13 +127,13 @@
#endif
/* dirs */
-#define DPATH IRCD_PREFIX
+#define DPATH IRCD_PREFIX
#define BINPATH IRCD_PREFIX "/bin/"
-#define ETCPATH IRCD_PREFIX "/etc"
-#define LOGPATH IRCD_PREFIX "/logs"
+#define ETCPATH "@GENTOO_PORTAGE_EPREFIX@/etc/ultimateircd"
+#define LOGPATH "@GENTOO_PORTAGE_EPREFIX@/var/log/ultimateircd"
/* files */
-#define SPATH BINPATH "/ircd" /* ircd executable */
+#define SPATH BINPATH "/ultimateircd" /* ircd executable */
#define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */
#define DCONF ETCPATH "/ircd.ini" /* Dynamic Configuration File */
@@ -144,7 +144,7 @@
#define SMPATH ETCPATH "/ircd.smotd" /* Short Message Of The Day */
#define OMPATH ETCPATH "/ircd.opermotd" /* Operator Message Of The Day */
#define RPATH ETCPATH "/ircd.rules" /* Rules File */
-#define PPATH ETCPATH "/ircd.pid" /* IRCd PID */
+#define PPATH "@GENTOO_PORTAGE_EPREFIX@/var/run/ultimateircd/ircd.pid" /* IRCd PID */
#define IRCDSSL_CPATH ETCPATH "/ircd.crt" /* Client SSL */
#define IRCDSSL_KPATH ETCPATH "/ircd.key" /* Client SSL */
1.1 net-irc/ultimate/files/ultimateircd.conf.2
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimateircd.conf.2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ultimate/files/ultimateircd.conf.2?rev=1.1&content-type=text/plain
Index: ultimateircd.conf.2
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.conf.2,v 1.1 2011/05/02 20:43:45 flameeyes Exp $
# user to run ultimateircd as
ULTIMATEIRCD_USER="ultimateircd"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-02 20:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-02 20:43 [gentoo-commits] gentoo-x86 commit in net-irc/ultimate/files: ultimate-3.0.2-system-zlib.patch ultimate-3.0.2-entropy-path.patch ultimate-3.0.2-make-failfast.patch ultimateircd.rc.2 ultimate-3.0.2-open-mode.patch ultimate-3.0.2-config.patch.in ultimateircd.conf.2 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox