[patch] files/dancer-ircd-rename-to-hyperion.patch

dancer-ircd-rename-to-hyperion.patch (text/plain), 8.20 KB, created by Bjarke Istrup Pedersen (RETIRED) on 2006-04-14 08:03:45 UTC

diff -aurp old/Makefile.am new/Makefile.am
--- old/Makefile.am	2005-06-10 23:25:24 +0000
+++ new/Makefile.am	2006-04-14 22:47:54 +0000
@@ -23,14 +23,14 @@ dist-hook:
 	(cd $(distdir)/include && cmp config.h.dist config.h || cp config.h.dist config.h)
 
 install-exec-hook:
-	(${mkinstalldirs} ${DESTDIR}${prefix}/var/lib/dancer-ircd && \
-	cd ${DESTDIR}${prefix}/var/lib/dancer-ircd && \
+	(${mkinstalldirs} ${DESTDIR}${prefix}/var/lib/hyperion && \
+	cd ${DESTDIR}${prefix}/var/lib/hyperion && \
 	([ -f kline.conf ] || [ -L kline.conf ] || touch kline.conf) && \
 	([ -f dline.conf ] || [ -L dline.conf ] || touch dline.conf))
-	(${mkinstalldirs} ${DESTDIR}${prefix}/var/log/dancer-ircd && \
-	cd ${DESTDIR}${prefix}/var/log/dancer-ircd && \
+	(${mkinstalldirs} ${DESTDIR}${prefix}/var/log/hyperion && \
+	cd ${DESTDIR}${prefix}/var/log/hyperion && \
 	([ -f ircd.log ] || [ -L ircd.log ] || touch ircd.log))
-	${mkinstalldirs} ${DESTDIR}${prefix}/var/run/dancer-ircd
+	${mkinstalldirs} ${DESTDIR}${prefix}/var/run/hyperion
 
 sign:
 	gpg --detach-sign $(distdir).tar.gz
diff -aurp old/Makefile.in new/Makefile.in
--- old/Makefile.in	2005-08-29 10:58:06 +0000
+++ new/Makefile.in	2006-04-14 22:48:24 +0000
@@ -587,14 +587,14 @@ dist-hook:
 	(cd $(distdir)/include && cmp config.h.dist config.h || cp config.h.dist config.h)
 
 install-exec-hook:
-	(${mkinstalldirs} ${DESTDIR}${prefix}/var/lib/dancer-ircd && \
-	cd ${DESTDIR}${prefix}/var/lib/dancer-ircd && \
+	(${mkinstalldirs} ${DESTDIR}${prefix}/var/lib/hyperion && \
+	cd ${DESTDIR}${prefix}/var/lib/hyperion && \
 	([ -f kline.conf ] || [ -L kline.conf ] || touch kline.conf) && \
 	([ -f dline.conf ] || [ -L dline.conf ] || touch dline.conf))
-	(${mkinstalldirs} ${DESTDIR}${prefix}/var/log/dancer-ircd && \
-	cd ${DESTDIR}${prefix}/var/log/dancer-ircd && \
+	(${mkinstalldirs} ${DESTDIR}${prefix}/var/log/hyperion && \
+	cd ${DESTDIR}${prefix}/var/log/hyperion && \
 	([ -f ircd.log ] || [ -L ircd.log ] || touch ircd.log))
-	${mkinstalldirs} ${DESTDIR}${prefix}/var/run/dancer-ircd
+	${mkinstalldirs} ${DESTDIR}${prefix}/var/run/hyperion
 
 sign:
 	gpg --detach-sign $(distdir).tar.gz
diff -aurp old/README new/README
--- old/README	2005-12-19 12:32:20 +0000
+++ new/README	2006-04-14 22:50:48 +0000
@@ -8,9 +8,9 @@ with bugs/features/whatever about this.
 
 This is the current hyperion ircd tree, forked from dancer-ircd 1.0.35+pre2.
 Installation: ./configure with options, edit include/config.h and make && make
-install. For the configuration file, go to ${prefix}/etc/dancer-ircd/,
+install. For the configuration file, go to ${prefix}/etc/hyperion/,
 copy example.conf to ircd.conf and edit it. Logs are under
-${prefix}/var/log/dancer-ircd/.
+${prefix}/var/log/hyperion/.
 
 Important: Make sure to update your client Y:lines when updating from
 any version before r336 to r336 or later, otherwise there will not be
diff -aurp old/doc/Makefile.am new/doc/Makefile.am
--- old/doc/Makefile.am	2005-09-01 18:26:00 +0000
+++ new/doc/Makefile.am	2006-04-14 22:49:18 +0000
@@ -5,7 +5,7 @@ include $(top_srcdir)/build-misc/common.
 SUBDIRS = sgml
 
 exconf_DATA = example.conf ohelp
-exconfdir = ${sysconfdir}/dancer-ircd
+exconfdir = ${sysconfdir}/hyperion
 
 EXTRA_DIST = \
 	README.umodes \
diff -aurp old/doc/Makefile.in new/doc/Makefile.in
--- old/doc/Makefile.in	2005-09-01 18:26:00 +0000
+++ new/doc/Makefile.in	2006-04-14 22:49:35 +0000
@@ -159,7 +159,7 @@ CLEANFILES = *.bb *.bbg *.gcov *.da
 pkgdocdir = $(datadir)/doc/$(PACKAGE)
 SUBDIRS = sgml
 exconf_DATA = example.conf ohelp
-exconfdir = ${sysconfdir}/dancer-ircd
+exconfdir = ${sysconfdir}/hyperion
 EXTRA_DIST = \
 	README.umodes \
 	blalloc.txt \
diff -aurp old/src/Makefile.am new/src/Makefile.am
--- old/src/Makefile.am	2005-11-08 22:23:37 +0000
+++ new/src/Makefile.am	2006-04-14 23:38:17 +0000
@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/build-misc/common.mk
 
-sbin_PROGRAMS = hyperion-ircd
+sbin_PROGRAMS = hyperion
 
 AM_CPPFLAGS = -DPREFIX="\"$(prefix)\""
 
diff -aurp old/src/Makefile.in new/src/Makefile.in
--- old/src/Makefile.in	2005-11-08 22:23:37 +0000
+++ new/src/Makefile.in	2006-04-14 23:39:19 +0000
@@ -38,7 +38,7 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/build-misc/common.mk
-sbin_PROGRAMS = hyperion-ircd$(EXEEXT)
+sbin_PROGRAMS = hyperion$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/autoconf/hyperion-c.m4 \
@@ -348,8 +348,8 @@ uninstall-sbinPROGRAMS:
 
 clean-sbinPROGRAMS:
 	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
-hyperion-ircd$(EXEEXT): $(hyperion_ircd_OBJECTS) $(hyperion_ircd_DEPENDENCIES) 
-	@rm -f hyperion-ircd$(EXEEXT)
+hyperion$(EXEEXT): $(hyperion_ircd_OBJECTS) $(hyperion_ircd_DEPENDENCIES) 
+	@rm -f hyperion$(EXEEXT)
 	$(LINK) $(hyperion_ircd_LDFLAGS) $(hyperion_ircd_OBJECTS) $(hyperion_ircd_LDADD) $(LIBS)
 
 mostlyclean-compile:
diff -aurp old/src/paths.c new/src/paths.c
--- old/src/paths.c	2005-07-13 18:17:48 +0000
+++ new/src/paths.c	2006-04-14 22:54:44 +0000
@@ -64,20 +64,20 @@
  */
 
 #define DPATH    PREFIX "/"
-#define SPATH    "sbin/hyperion-ircd"
-#define CPATH    "etc/dancer-ircd/ircd.conf"
-#define MPATH    "etc/dancer-ircd/motd"
-#define HPATH    "etc/dancer-ircd/ohelp"
-#define OPATH    "etc/dancer-ircd/omotd"
-#define LPATH    "var/log/dancer-ircd/ircd.log"
-#define HLBASE   "var/log/dancer-ircd/hash"
-#define USERLOG  "var/log/dancer-ircd/user.log"
-#define OPERLOG  "var/log/dancer-ircd/oper.log"
-#define PPATH    "var/run/dancer-ircd/dancer-ircd.pid"
-#define KPATH    "var/lib/dancer-ircd/kline.conf"
-#define DLPATH   "var/lib/dancer-ircd/dline.conf"
-#define MXPATH   "var/lib/dancer-ircd/ircd.max"
-#define DUMPPATH "var/lib/dancer-ircd/dump"
+#define SPATH    "sbin/hyperion"
+#define CPATH    "etc/hyperion/ircd.conf"
+#define MPATH    "etc/hyperion/motd"
+#define HPATH    "etc/hyperion/ohelp"
+#define OPATH    "etc/hyperion/omotd"
+#define LPATH    "var/log/hyperion/ircd.log"
+#define HLBASE   "var/log/hyperion/hash"
+#define USERLOG  "var/log/hyperion/user.log"
+#define OPERLOG  "var/log/hyperion/oper.log"
+#define PPATH    "var/run/hyperion/hyperion.pid"
+#define KPATH    "var/lib/hyperion/kline.conf"
+#define DLPATH   "var/lib/hyperion/dline.conf"
+#define MXPATH   "var/lib/hyperion/ircd.max"
+#define DUMPPATH "var/lib/hyperion/dump"
 
 const char *work_dir = DPATH;
 const char *config_file = CPATH;
diff -aurp old/tools/debugnet.pl new/tools/debugnet.pl
--- old/tools/debugnet.pl	2005-02-09 19:45:22 +0000
+++ new/tools/debugnet.pl	2006-04-14 22:54:07 +0000
@@ -112,7 +112,7 @@ sub build
     mkdir $debug_tree unless -e $debug_tree;
     die "The target tree $debug_tree is not a directory!\n" unless -d $debug_tree;
 
-    copy("$build_tree/src/dancer-ircd", "$debug_tree/ircd");
+    copy("$build_tree/src/hyperion", "$debug_tree/ircd");
     (scalar chmod 0755, "$debug_tree/ircd") == 1
       or warn "Couldn't chmod 0755 $debug_tree/ircd\n";
   }
@@ -154,29 +154,29 @@ sub create_tree
 	rmtree "$debug_tree/$name" if -e "$debug_tree/$name";
 
 	# Make the new tree
-	mkpath ["$debug_tree/$name/etc/dancer-ircd",
+	mkpath ["$debug_tree/$name/etc/hyperion",
 		"$debug_tree/$name/sbin",
-		"$debug_tree/$name/var/lib/dancer-ircd",
-		"$debug_tree/$name/var/log/dancer-ircd",
-		"$debug_tree/$name/var/run/dancer-ircd"];
-	symlink "../../ircd", "$debug_tree/$name/sbin/dancer-ircd";
+		"$debug_tree/$name/var/lib/hyperion",
+		"$debug_tree/$name/var/log/hyperion",
+		"$debug_tree/$name/var/run/hyperion"];
+	symlink "../../ircd", "$debug_tree/$name/sbin/hyperion";
 
 	# Create the empty files
 	foreach my $file (qw!
-			  etc/dancer-ircd/motd
-			  etc/dancer-ircd/omotd
-			  etc/dancer-ircd/ohelp
-			  var/lib/dancer-ircd/kline.conf
-			  var/lib/dancer-ircd/dline.conf
-			  var/log/dancer-ircd/user.log
-			  var/log/dancer-ircd/oper.log!)
+			  etc/hyperion/motd
+			  etc/hyperion/omotd
+			  etc/hyperion/ohelp
+			  var/lib/hyperion/kline.conf
+			  var/lib/hyperion/dline.conf
+			  var/log/hyperion/user.log
+			  var/log/hyperion/oper.log!)
 	  {
 	    open(FH, ">$debug_tree/$name/$file");
 	    close(FH);
 	  }
 
 	# Create the config file
-	open(CONF, ">$debug_tree/$name/etc/dancer-ircd/ircd.conf");
+	open(CONF, ">$debug_tree/$name/etc/hyperion/ircd.conf");
 
 	# First the stub
 	print CONF $config;