[arch-commits] Commit in unrealircd/trunk (PKGBUILD arch-fixes.patch config.settings)

[Sergej Pupykin]

    Date: Thursday, January 7, 2016 @ 18:37:32
  Author: spupykin
Revision: 155649

Modified:
  unrealircd/trunk/PKGBUILD
  unrealircd/trunk/config.settings
Deleted:
  unrealircd/trunk/arch-fixes.patch

------------------+
 PKGBUILD         |   15 +++++++-------
 arch-fixes.patch |   56 -----------------------------------------------------
 config.settings  |    2 -
 3 files changed, 9 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-07 14:42:08 UTC (rev 155648)
+++ PKGBUILD	2016-01-07 17:37:32 UTC (rev 155649)
@@ -4,7 +4,7 @@
 
 pkgname=unrealircd
 pkgver=4.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source IRC Server"
 arch=('i686' 'x86_64')
 url="http://unrealircd.com"
@@ -18,14 +18,12 @@
 	unrealircd.service
 	unrealircd.tmpfiles.d
 	config.settings
-	install.pl
-	arch-fixes.patch)
+	install.pl)
 md5sums=('ea5922554cda40e39a2d6fd7520284f1'
          '677d8de0bae770488a2c1730f9475a51'
          '3ec519ea7dbe99696eb6c51dfc0d382a'
-         '20784da01c3d35f1cea91bd27ca44a75'
-         '3a23792b03420fc578cf6688b1574ae3'
-         '5f4bf9f99f6c78bc9e6ee4ec66b021fa')
+         '11ce231048c92651e76fdeb58609d0ba'
+         '3a23792b03420fc578cf6688b1574ae3')
 
 prepare() {
   cd $srcdir/unrealircd-$pkgver
@@ -34,6 +32,7 @@
     -e 's|$(INSTALL) -m 0700|$(INSTALL) -m 0755|g' \
     -e 's|$(INSTALL) -m 0600|$(INSTALL) -m 0644|g' \
     Makefile.in
+  sed -i 's|ARG=" "|ARG="--with-pidfile=/run/unrealircd/ircd.pid "|' Config
 }
 
 build() {
@@ -47,7 +46,9 @@
 
   export pkgdir
   make INSTALL=$srcdir/install.pl install
-  rm -rf $pkgdir/tmp $pkgdir/usr/unrealircd
+  mv $pkgdir/usr/unrealircd $pkgdir/etc/unrealircd/unrealircd
+  cp $pkgdir/etc/unrealircd/examples/example.conf $pkgdir/etc/unrealircd/unrealircd.conf
+  rm -rf $pkgdir/tmp
 
   install -Dm0644 $srcdir/unrealircd.service $pkgdir/usr/lib/systemd/system/unrealircd.service
   install -Dm0644 $srcdir/unrealircd.tmpfiles.d $pkgdir/usr/lib/tmpfiles.d/unrealircd.conf

Deleted: arch-fixes.patch
===================================================================
--- arch-fixes.patch	2016-01-07 14:42:08 UTC (rev 155648)
+++ arch-fixes.patch	2016-01-07 17:37:32 UTC (rev 155649)
@@ -1,56 +0,0 @@
-diff -wbBur Unreal3.2.10.2.org/doc/example.conf Unreal3.2.10.2/doc/example.conf
---- Unreal3.2.10.2.org/doc/example.conf	2013-11-24 23:24:26.000000000 +0400
-+++ Unreal3.2.10.2/doc/example.conf	2014-01-27 14:38:16.669081776 +0400
-@@ -33,8 +33,8 @@
-  */
- 
- /* FOR *NIX, uncomment the following 2lines: */
--//loadmodule "src/modules/commands.so";
--//loadmodule "src/modules/cloak.so";
-+loadmodule "modules/commands.so";
-+loadmodule "modules/cloak.so";
- 
- /* FOR Windows, uncomment the following 2 lines: */
- //loadmodule "modules/commands.dll";
-diff -wbBur Unreal3.2.10.2.org/include/config.h Unreal3.2.10.2/include/config.h
---- Unreal3.2.10.2.org/include/config.h	2013-11-24 23:24:26.000000000 +0400
-+++ Unreal3.2.10.2/include/config.h	2014-01-27 14:38:53.349081379 +0400
-@@ -248,7 +248,7 @@
- #define RPATH   	"ircd.rules"	/* server rules file */
- #define OPATH   	"oper.motd"	/* Operators MOTD file */
- #define	LPATH		"debug.log"	/* Where the debug file lives, if DEBUGMODE */
--#define	PPATH		"ircd.pid"	/* file for server pid */
-+#define	PPATH		"/run/unrealircd/ircd.pid"	/* file for server pid */
- #define VPATH		"ircd.svsmotd"	/* Services MOTD append. */
- #define BPATH		"bot.motd"	/* Bot MOTD */
- #define IRCDTUNE 	"ircd.tune"	/* tuning .. */
-diff -wbBur Unreal3.2.10.2.org/src/ircd.c Unreal3.2.10.2/src/ircd.c
---- Unreal3.2.10.2.org/src/ircd.c	2013-11-24 23:24:26.000000000 +0400
-+++ Unreal3.2.10.2/src/ircd.c	2014-01-27 14:38:16.669081776 +0400
-@@ -840,7 +840,7 @@
- const char *compiledfor, *runtime;
- int error = 0;
- 
--#ifdef USE_SSL
-+#if 0
- 	compiledfor = OPENSSL_VERSION_TEXT;
- 	runtime = SSLeay_version(SSLEAY_VERSION);
- 	if (strcasecmp(compiledfor, runtime))
-@@ -850,7 +850,7 @@
- 		error=1;
- 	}
- #endif
--#ifdef ZIP_LINKS
-+#if 0
- 	runtime = zlibVersion();
- 	compiledfor = ZLIB_VERSION;
- 	if (*compiledfor != *runtime)
-@@ -860,7 +860,7 @@
- 		error = 1;
- 	}
- #endif
--#ifdef USE_LIBCURL
-+#if 0
- 	/* Perhaps someone should tell them to do this a bit more easy ;)
- 	 * problem is runtime output is like: 'libcurl/7.11.1 zlib/1.2.1 c-ares/1.2.0'
- 	 * while header output is like: '7.11.1'.

Modified: config.settings
===================================================================
--- config.settings	2016-01-07 14:42:08 UTC (rev 155648)
+++ config.settings	2016-01-07 17:37:32 UTC (rev 155649)
@@ -1,7 +1,7 @@
 #
 BASEPATH="/usr"
 BINDIR="/usr/bin"
-DATADIR="/usr/share/unrealircd"
+DATADIR="/var/lib/unrealircd"
 CONFDIR="/etc/unrealircd"
 MODULESDIR="/usr/lib/unrealircd"
 LOGDIR="/var/log/unrealircd"