tags 511611 + patch tags 511611 + pending tags 519136 + pending tags 640559 + pending thanks
Dear maintainer, I've prepared an NMU for ircd-hybrid (versioned as 1:7.2.2.dfsg.2-6.3) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - PGP/GPG key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Little Walter: Juke
diff -u ircd-hybrid-7.2.2.dfsg.2/debian/changelog ircd-hybrid-7.2.2.dfsg.2/debian/changelog
--- ircd-hybrid-7.2.2.dfsg.2/debian/changelog
+++ ircd-hybrid-7.2.2.dfsg.2/debian/changelog
@@ -1,3 +1,27 @@
+ircd-hybrid (1:7.2.2.dfsg.2-6.3) unstable; urgency=low
+
+ * NMU.
+ * Merge Ubuntu diff:
+
+ [ Colin Watson ]
+ * Update 16_use_debian_pcre.dpatch to link dynamically with libpcre rather
+ than statically (closes: #640559, LP: #749282).
+
+ [ Bhavani Shankar ]
+ * Create /var/run/ircd on start/restart rather than relying on the directory
+ shipped in the package, since /var/run may be a tmpfs
+ (closes: #519136, LP: #337715).
+ * Prevent conflict with other ircds: remove Conflicts: ircd. inspircd and
+ ircd-ratbox are the only current ircds that aren't explicitly conflicted
+ with, and there are no file conflicts with those packages
+ (closes: #511611, LP: #375619).
+
+ [ gregor herrmann ]
+ * Add $remote_fs to Required-{Start,Stop} in debian/ircd-hybrid.init
+ (lintian error).
+
+ -- gregor herrmann <[email protected]> Tue, 20 Sep 2011 19:17:42 +0200
+
ircd-hybrid (1:7.2.2.dfsg.2-6.2) unstable; urgency=low
* Non-maintainer upload.
diff -u ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.dirs ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.dirs
--- ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.dirs
+++ ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.dirs
@@ -1,3 +1,2 @@
-var/run/ircd
var/log/ircd
usr/share/lintian/overrides
diff -u ircd-hybrid-7.2.2.dfsg.2/debian/control ircd-hybrid-7.2.2.dfsg.2/debian/control
--- ircd-hybrid-7.2.2.dfsg.2/debian/control
+++ ircd-hybrid-7.2.2.dfsg.2/debian/control
@@ -9,7 +9,7 @@
Package: ircd-hybrid
Architecture: any
-Conflicts: ircd-ircu, ircd-irc2, dancer-ircd, oftc-hybrid, ircd
+Conflicts: ircd-ircu, ircd-irc2, dancer-ircd, oftc-hybrid
Pre-Depends: debconf (>= 0.5) | debconf-2.0
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: ircd
diff -u ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.init ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.init
--- ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.init
+++ ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.init
@@ -6,8 +6,8 @@
### BEGIN INIT INFO
# Provides: ircd-hybrid
-# Required-Start: $syslog
-# Required-Stop: $syslog
+# Required-Start: $syslog $remote_fs
+# Required-Stop: $syslog $remote_fs
# Should-Start: $local_fs $network $named
# Should-Stop: $local_fs $network $named
# Default-Start: 2 3 4 5
@@ -36,6 +36,8 @@
if [ "$START" = "yes" ]
then
echo -n "Starting $DESC: $NAME"
+ mkdir -p -m 755 /var/run/ircd
+ chown irc:irc /var/run/ircd
start-stop-daemon --start --quiet \
-u irc -c irc --exec $DAEMON -- -pidfile /var/run/ircd/$NAME.pid \
> /dev/null
@@ -74,6 +76,8 @@
--exec $DAEMON -- -pidfile /var/run/ircd/$NAME.pid
sleep 1
fi
+ mkdir -p -m 755 /var/run/ircd
+ chown irc:irc /var/run/ircd
start-stop-daemon --start --quiet \
-u irc -c irc --exec $DAEMON -- -pidfile /var/run/ircd/$NAME.pid \
> /dev/null
diff -u ircd-hybrid-7.2.2.dfsg.2/debian/rules ircd-hybrid-7.2.2.dfsg.2/debian/rules
--- ircd-hybrid-7.2.2.dfsg.2/debian/rules
+++ ircd-hybrid-7.2.2.dfsg.2/debian/rules
@@ -277,7 +277,7 @@
dh_fixperms -a
- chown irc:irc debian/ircd-hybrid/var/run/ircd debian/ircd-hybrid/var/log/ircd
+ chown irc:irc debian/ircd-hybrid/var/log/ircd
chown -R irc:irc $(I_ETC)
chmod -R 660 $(I_ETC)
ifdef USE_OPENSSL
@@ -285,7 +285,6 @@
cp debian/cert.cnf $(I_ETC)
endif
chmod ug+x $(I_ETC)
- chmod 755 debian/ircd-hybrid/var/run/ircd
chmod -x $(I_DOC)/examples/simple.conf
dh_installinit -a -n
diff -u ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.postinst.in ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.postinst.in
--- ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.postinst.in
+++ ircd-hybrid-7.2.2.dfsg.2/debian/ircd-hybrid.postinst.in
@@ -33,7 +33,7 @@
# owned by irc. Or the initscript will get owned. If it's already this
# way, this operation makes no difference.
- chown irc:irc /var/run/ircd /var/log/ircd /etc/ircd-hybrid
+ chown irc:irc /var/log/ircd /etc/ircd-hybrid
chmod 770 /etc/ircd-hybrid
if [ "$RET" = "true" ]; then
diff -u ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch
--- ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch
+++ ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch
@@ -74,14 +74,14 @@
CORE_SRCS = \
diff -urNad ircd-hybrid-7.2.2~/src/Makefile.in ircd-hybrid-7.2.2/src/Makefile.in
--- ircd-hybrid-7.2.2~/src/Makefile.in 2006-08-31 18:45:47.034670237 +0000
-+++ ircd-hybrid-7.2.2/src/Makefile.in 2006-08-31 18:45:47.378765476 +0000
++++ ircd-hybrid-7.2.2/src/Makefile.in 2011-09-09 02:23:18.818901800 +0100
@@ -35,8 +35,8 @@
SSL_LIBS = @SSL_LIBS@
SSL_INCLUDES = @SSL_INCLUDES@
-IRCDLIBS = @MODULES_LIBS@ @LIBS@ ../lib/pcre/libpcre.a $(SSL_LIBS)
-INCLUDES = -I../include -I../lib/pcre $(SSL_INCLUDES)
-+IRCDLIBS = @MODULES_LIBS@ @LIBS@ /usr/lib/libpcre.a $(SSL_LIBS)
++IRCDLIBS = @MODULES_LIBS@ @LIBS@ -lpcre $(SSL_LIBS)
+INCLUDES = -I../include -I/usr/include/pcre $(SSL_INCLUDES)
CPPFLAGS = ${INCLUDES} @CPPFLAGS@
@@ -91,7 +91,7 @@
build: all
-ircd: @MODULES_LIBS@ ../lib/libpcre.a $(OBJS)
-+ircd: @MODULES_LIBS@ /usr/lib/libpcre.a $(OBJS)
++ircd: @MODULES_LIBS@ $(OBJS)
${CC} ${CFLAGS} ${LDFLAGS} -o ircd-hybrid ${OBJS} ${IRCDLIBS}
../modules/libmodules.a:
signature.asc
Description: Digital signature
