[arch-commits] Commit in ultimate-ircd/repos (20 files)

Sergej Pupykin spupykin at archlinux.org
Tue Feb 10 17:46:22 UTC 2015


    Date: Tuesday, February 10, 2015 @ 18:46:22
  Author: spupykin
Revision: 127526

archrelease: copy trunk to community-i686, community-x86_64

Added:
  ultimate-ircd/repos/community-i686/PKGBUILD
    (from rev 127525, ultimate-ircd/trunk/PKGBUILD)
  ultimate-ircd/repos/community-i686/conf-fix.patch
    (from rev 127525, ultimate-ircd/trunk/conf-fix.patch)
  ultimate-ircd/repos/community-i686/ircd.install
    (from rev 127525, ultimate-ircd/trunk/ircd.install)
  ultimate-ircd/repos/community-i686/ultimate-ircd.service
    (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.service)
  ultimate-ircd/repos/community-i686/ultimate-ircd.tmpfiles
    (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.tmpfiles)
  ultimate-ircd/repos/community-x86_64/PKGBUILD
    (from rev 127525, ultimate-ircd/trunk/PKGBUILD)
  ultimate-ircd/repos/community-x86_64/conf-fix.patch
    (from rev 127525, ultimate-ircd/trunk/conf-fix.patch)
  ultimate-ircd/repos/community-x86_64/ircd.install
    (from rev 127525, ultimate-ircd/trunk/ircd.install)
  ultimate-ircd/repos/community-x86_64/ultimate-ircd.service
    (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.service)
  ultimate-ircd/repos/community-x86_64/ultimate-ircd.tmpfiles
    (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.tmpfiles)
Deleted:
  ultimate-ircd/repos/community-i686/PKGBUILD
  ultimate-ircd/repos/community-i686/conf-fix.patch
  ultimate-ircd/repos/community-i686/ircd.install
  ultimate-ircd/repos/community-i686/ultimate-ircd.service
  ultimate-ircd/repos/community-i686/ultimate-ircd.tmpfiles
  ultimate-ircd/repos/community-x86_64/PKGBUILD
  ultimate-ircd/repos/community-x86_64/conf-fix.patch
  ultimate-ircd/repos/community-x86_64/ircd.install
  ultimate-ircd/repos/community-x86_64/ultimate-ircd.service
  ultimate-ircd/repos/community-x86_64/ultimate-ircd.tmpfiles

-----------------------------------------+
 /PKGBUILD                               |  122 ++++++++++++++++++++++++++++++
 /conf-fix.patch                         |   50 ++++++++++++
 /ircd.install                           |   26 ++++++
 /ultimate-ircd.service                  |   24 +++++
 /ultimate-ircd.tmpfiles                 |    2 
 community-i686/PKGBUILD                 |   61 ---------------
 community-i686/conf-fix.patch           |   25 ------
 community-i686/ircd.install             |   31 -------
 community-i686/ultimate-ircd.service    |   12 --
 community-i686/ultimate-ircd.tmpfiles   |    1 
 community-x86_64/PKGBUILD               |   61 ---------------
 community-x86_64/conf-fix.patch         |   25 ------
 community-x86_64/ircd.install           |   31 -------
 community-x86_64/ultimate-ircd.service  |   12 --
 community-x86_64/ultimate-ircd.tmpfiles |    1 
 15 files changed, 224 insertions(+), 260 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-i686/PKGBUILD	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=ultimate-ircd
-pkgver=3.0.2
-pkgrel=7
-pkgdesc="ultimate irc server"
-arch=(i686 x86_64)
-url="http://www.shadow-realm.org/"
-license=("GPL")
-depends=(glibc)
-makedepends=(patch)
-conflicts=(ircd)
-provides=(ircd)
-backup=()
-install=ircd.install
-source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2
-	ultimate-ircd.service
-	ultimate-ircd.tmpfiles
-	conf-fix.patch)
-md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
-         '526fd78018b9b011787e4e9012437116'
-         'e51723ab29e7a3ddc3589846815de0c9'
-         '5e0f2a02e12675ac070a148c3234e111')
-
-build() {
-  cd $srcdir/Ultimate$pkgver
-  ./configure --prefix=/usr --enable-chinese-nick
-
-  for i in `find -type f -name Makefile`; do
-    echo Patching $i...
-    sed -i "s#prefix		= /usr#prefix		= $pkgdir/usr#" $i
-    sed -i "s#libexecdir	= \${bindir}#libexecdir	= $pkgdir/usr/lib/ircd#" $i
-    sed -i "s#sysconfdir	= \${prefix}/etc#sysconfdir	= $pkgdir/etc/ircd#" $i
-    sed -i "s#localstatedir	= \${prefix}#localstatedir	= $pkgdir/var#" $i
-    sed -i "s#networksubdir   = \${prefix}/etc/networks#networksubdir   = $pkgdir/etc/ircd/networks#" $i
-    sed -i "s#\$(localstatedir)/logs#\$(localstatedir)/log/ircd#" $i
-  done
-
-  cd include && patch -N <../../conf-fix.patch && cd ..
-  make || return 1
-}
-
-package() {
-  cd $srcdir/Ultimate$pkgver
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/var/log/ircd
-  mkdir -p $pkgdir/etc/ircd/networks
-  make install
-  rm -f $pkgdir/usr/ircd
-  rm -f $pkgdir/usr/kill
-  rm -f $pkgdir/usr/rehash
-  cd $pkgdir/usr/bin
-  mv mkpasswd irc-mkpasswd
-  mv ssl-cert.sh irc-ssl-cert.sh
-  mv ssl-search.sh irc-ssl-search.sh
-  install -d -m 0755 $pkgdir/var/lib/ircd
-  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-  install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
-}

Copied: ultimate-ircd/repos/community-i686/PKGBUILD (from rev 127525, ultimate-ircd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=ultimate-ircd
+pkgver=3.0.2
+pkgrel=8
+pkgdesc="ultimate irc server"
+arch=(i686 x86_64)
+url="http://www.shadow-realm.org/"
+license=("GPL")
+depends=(glibc)
+makedepends=(patch)
+conflicts=(ircd)
+provides=(ircd)
+backup=()
+install=ircd.install
+source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2
+	ultimate-ircd.service
+	ultimate-ircd.tmpfiles
+	conf-fix.patch)
+md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
+         '526fd78018b9b011787e4e9012437116'
+         'e51723ab29e7a3ddc3589846815de0c9'
+         '5e0f2a02e12675ac070a148c3234e111')
+
+build() {
+  cd $srcdir/Ultimate$pkgver
+  ./configure --prefix=/usr --enable-chinese-nick
+
+  for i in `find -type f -name Makefile`; do
+    echo Patching $i...
+    sed -i "s#prefix		= /usr#prefix		= $pkgdir/usr#" $i
+    sed -i "s#libexecdir	= \${bindir}#libexecdir	= $pkgdir/usr/lib/ircd#" $i
+    sed -i "s#sysconfdir	= \${prefix}/etc#sysconfdir	= $pkgdir/etc/ircd#" $i
+    sed -i "s#localstatedir	= \${prefix}#localstatedir	= $pkgdir/var#" $i
+    sed -i "s#networksubdir   = \${prefix}/etc/networks#networksubdir   = $pkgdir/etc/ircd/networks#" $i
+    sed -i "s#\$(localstatedir)/logs#\$(localstatedir)/log/ircd#" $i
+  done
+
+  cd include && patch -N <../../conf-fix.patch && cd ..
+  make
+}
+
+package() {
+  cd $srcdir/Ultimate$pkgver
+  mkdir -p $pkgdir/usr/bin
+  mkdir -p $pkgdir/var/log/ircd
+  mkdir -p $pkgdir/etc/ircd/networks
+  make install
+  rm -f $pkgdir/usr/ircd
+  rm -f $pkgdir/usr/kill
+  rm -f $pkgdir/usr/rehash
+  cd $pkgdir/usr/bin
+  mv mkpasswd irc-mkpasswd
+  mv ssl-cert.sh irc-ssl-cert.sh
+  mv ssl-search.sh irc-ssl-search.sh
+  install -d -m 0755 $pkgdir/var/lib/ircd
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
+}

Deleted: community-i686/conf-fix.patch
===================================================================
--- community-i686/conf-fix.patch	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-i686/conf-fix.patch	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,25 +0,0 @@
---- ./config.h.org	2005-04-11 10:30:55.000000000 -0700
-+++ ./config.h	2006-04-26 17:42:04.000000000 -0700
-@@ -110,10 +110,12 @@
- /* dirs */
- #define DPATH		IRCD_PREFIX                                                     
- #define BINPATH		IRCD_PREFIX "/bin/"
--#define ETCPATH		IRCD_PREFIX "/etc"
--#define LOGPATH		IRCD_PREFIX "/logs"
-+#define ETCPATH "/etc/ircd"
-+#define LOGPATH "/var/log/ircd"
- 
- /* files */
-+#define	PPATH		"/var/run/ircd/ircd.pid"
-+
- #define SPATH		BINPATH "/ircd"			/* ircd executable */
- 
- #define CPATH		ETCPATH "/ircd.conf"		/* ircd.conf file */
-@@ -125,7 +127,6 @@
- #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 IRCDSSL_CPATH 	ETCPATH "/ircd.crt"		/* Client SSL */
- #define IRCDSSL_KPATH 	ETCPATH "/ircd.key"		/* Client SSL */
- 

Copied: ultimate-ircd/repos/community-i686/conf-fix.patch (from rev 127525, ultimate-ircd/trunk/conf-fix.patch)
===================================================================
--- community-i686/conf-fix.patch	                        (rev 0)
+++ community-i686/conf-fix.patch	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,25 @@
+--- ./config.h.org	2005-04-11 10:30:55.000000000 -0700
++++ ./config.h	2006-04-26 17:42:04.000000000 -0700
+@@ -110,10 +110,12 @@
+ /* dirs */
+ #define DPATH		IRCD_PREFIX                                                     
+ #define BINPATH		IRCD_PREFIX "/bin/"
+-#define ETCPATH		IRCD_PREFIX "/etc"
+-#define LOGPATH		IRCD_PREFIX "/logs"
++#define ETCPATH "/etc/ircd"
++#define LOGPATH "/var/log/ircd"
+ 
+ /* files */
++#define	PPATH		"/var/run/ircd/ircd.pid"
++
+ #define SPATH		BINPATH "/ircd"			/* ircd executable */
+ 
+ #define CPATH		ETCPATH "/ircd.conf"		/* ircd.conf file */
+@@ -125,7 +127,6 @@
+ #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 IRCDSSL_CPATH 	ETCPATH "/ircd.crt"		/* Client SSL */
+ #define IRCDSSL_KPATH 	ETCPATH "/ircd.key"		/* Client SSL */
+ 

Deleted: community-i686/ircd.install
===================================================================
--- community-i686/ircd.install	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-i686/ircd.install	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,31 +0,0 @@
-pre_install() {
-  /bin/true
-}
-
-post_install() {
-    groupadd irc
-    useradd -G irc -d /var/lib/ircd ircd
-    chown -R ircd.irc /var/log/ircd
-    chown -R ircd.irc /var/lib/ircd
-    chown -R ircd.irc /var/run/ircd
-}
-
-pre_upgrade() {
-  /bin/true
-}
-
-post_upgrade() {
-    chown -R ircd.irc /var/log/ircd
-    chown -R ircd.irc /var/lib/ircd
-    chown -R ircd.irc /var/run/ircd
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-    userdel ircd
-    groupdel irc
-}
-

Copied: ultimate-ircd/repos/community-i686/ircd.install (from rev 127525, ultimate-ircd/trunk/ircd.install)
===================================================================
--- community-i686/ircd.install	                        (rev 0)
+++ community-i686/ircd.install	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,13 @@
+post_install() {
+    groupadd -r irc
+    useradd -r -G irc -d /var/lib/ircd ircd
+    chown -R ircd:irc var/log/ircd
+    chown -R ircd:irc var/lib/ircd
+    chown -R ircd:irc var/run/ircd
+}
+
+post_upgrade() {
+    chown -R ircd:irc var/log/ircd
+    chown -R ircd:irc var/lib/ircd
+    chown -R ircd:irc var/run/ircd
+}

Deleted: community-i686/ultimate-ircd.service
===================================================================
--- community-i686/ultimate-ircd.service	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-i686/ultimate-ircd.service	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,12 +0,0 @@
-[Unit]
-Description=IRC daemon
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-User=ircd
-PIDFile=/var/run/ircd/ircd.pid
-ExecStart=/usr/bin/ircd -f /etc/ircd/ircd.conf
-
-[Install]
-WantedBy=multi-user.target

Copied: ultimate-ircd/repos/community-i686/ultimate-ircd.service (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.service)
===================================================================
--- community-i686/ultimate-ircd.service	                        (rev 0)
+++ community-i686/ultimate-ircd.service	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,12 @@
+[Unit]
+Description=IRC daemon
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+User=ircd
+PIDFile=/var/run/ircd/ircd.pid
+ExecStart=/usr/bin/ircd -f /etc/ircd/ircd.conf
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/ultimate-ircd.tmpfiles
===================================================================
--- community-i686/ultimate-ircd.tmpfiles	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-i686/ultimate-ircd.tmpfiles	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1 +0,0 @@
-d /run/ircd 0755 ircd irc -

Copied: ultimate-ircd/repos/community-i686/ultimate-ircd.tmpfiles (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.tmpfiles)
===================================================================
--- community-i686/ultimate-ircd.tmpfiles	                        (rev 0)
+++ community-i686/ultimate-ircd.tmpfiles	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1 @@
+d /run/ircd 0755 ircd irc -

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-x86_64/PKGBUILD	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=ultimate-ircd
-pkgver=3.0.2
-pkgrel=7
-pkgdesc="ultimate irc server"
-arch=(i686 x86_64)
-url="http://www.shadow-realm.org/"
-license=("GPL")
-depends=(glibc)
-makedepends=(patch)
-conflicts=(ircd)
-provides=(ircd)
-backup=()
-install=ircd.install
-source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2
-	ultimate-ircd.service
-	ultimate-ircd.tmpfiles
-	conf-fix.patch)
-md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
-         '526fd78018b9b011787e4e9012437116'
-         'e51723ab29e7a3ddc3589846815de0c9'
-         '5e0f2a02e12675ac070a148c3234e111')
-
-build() {
-  cd $srcdir/Ultimate$pkgver
-  ./configure --prefix=/usr --enable-chinese-nick
-
-  for i in `find -type f -name Makefile`; do
-    echo Patching $i...
-    sed -i "s#prefix		= /usr#prefix		= $pkgdir/usr#" $i
-    sed -i "s#libexecdir	= \${bindir}#libexecdir	= $pkgdir/usr/lib/ircd#" $i
-    sed -i "s#sysconfdir	= \${prefix}/etc#sysconfdir	= $pkgdir/etc/ircd#" $i
-    sed -i "s#localstatedir	= \${prefix}#localstatedir	= $pkgdir/var#" $i
-    sed -i "s#networksubdir   = \${prefix}/etc/networks#networksubdir   = $pkgdir/etc/ircd/networks#" $i
-    sed -i "s#\$(localstatedir)/logs#\$(localstatedir)/log/ircd#" $i
-  done
-
-  cd include && patch -N <../../conf-fix.patch && cd ..
-  make || return 1
-}
-
-package() {
-  cd $srcdir/Ultimate$pkgver
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/var/log/ircd
-  mkdir -p $pkgdir/etc/ircd/networks
-  make install
-  rm -f $pkgdir/usr/ircd
-  rm -f $pkgdir/usr/kill
-  rm -f $pkgdir/usr/rehash
-  cd $pkgdir/usr/bin
-  mv mkpasswd irc-mkpasswd
-  mv ssl-cert.sh irc-ssl-cert.sh
-  mv ssl-search.sh irc-ssl-search.sh
-  install -d -m 0755 $pkgdir/var/lib/ircd
-  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-  install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
-}

Copied: ultimate-ircd/repos/community-x86_64/PKGBUILD (from rev 127525, ultimate-ircd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=ultimate-ircd
+pkgver=3.0.2
+pkgrel=8
+pkgdesc="ultimate irc server"
+arch=(i686 x86_64)
+url="http://www.shadow-realm.org/"
+license=("GPL")
+depends=(glibc)
+makedepends=(patch)
+conflicts=(ircd)
+provides=(ircd)
+backup=()
+install=ircd.install
+source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2
+	ultimate-ircd.service
+	ultimate-ircd.tmpfiles
+	conf-fix.patch)
+md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
+         '526fd78018b9b011787e4e9012437116'
+         'e51723ab29e7a3ddc3589846815de0c9'
+         '5e0f2a02e12675ac070a148c3234e111')
+
+build() {
+  cd $srcdir/Ultimate$pkgver
+  ./configure --prefix=/usr --enable-chinese-nick
+
+  for i in `find -type f -name Makefile`; do
+    echo Patching $i...
+    sed -i "s#prefix		= /usr#prefix		= $pkgdir/usr#" $i
+    sed -i "s#libexecdir	= \${bindir}#libexecdir	= $pkgdir/usr/lib/ircd#" $i
+    sed -i "s#sysconfdir	= \${prefix}/etc#sysconfdir	= $pkgdir/etc/ircd#" $i
+    sed -i "s#localstatedir	= \${prefix}#localstatedir	= $pkgdir/var#" $i
+    sed -i "s#networksubdir   = \${prefix}/etc/networks#networksubdir   = $pkgdir/etc/ircd/networks#" $i
+    sed -i "s#\$(localstatedir)/logs#\$(localstatedir)/log/ircd#" $i
+  done
+
+  cd include && patch -N <../../conf-fix.patch && cd ..
+  make
+}
+
+package() {
+  cd $srcdir/Ultimate$pkgver
+  mkdir -p $pkgdir/usr/bin
+  mkdir -p $pkgdir/var/log/ircd
+  mkdir -p $pkgdir/etc/ircd/networks
+  make install
+  rm -f $pkgdir/usr/ircd
+  rm -f $pkgdir/usr/kill
+  rm -f $pkgdir/usr/rehash
+  cd $pkgdir/usr/bin
+  mv mkpasswd irc-mkpasswd
+  mv ssl-cert.sh irc-ssl-cert.sh
+  mv ssl-search.sh irc-ssl-search.sh
+  install -d -m 0755 $pkgdir/var/lib/ircd
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+  install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
+}

Deleted: community-x86_64/conf-fix.patch
===================================================================
--- community-x86_64/conf-fix.patch	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-x86_64/conf-fix.patch	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,25 +0,0 @@
---- ./config.h.org	2005-04-11 10:30:55.000000000 -0700
-+++ ./config.h	2006-04-26 17:42:04.000000000 -0700
-@@ -110,10 +110,12 @@
- /* dirs */
- #define DPATH		IRCD_PREFIX                                                     
- #define BINPATH		IRCD_PREFIX "/bin/"
--#define ETCPATH		IRCD_PREFIX "/etc"
--#define LOGPATH		IRCD_PREFIX "/logs"
-+#define ETCPATH "/etc/ircd"
-+#define LOGPATH "/var/log/ircd"
- 
- /* files */
-+#define	PPATH		"/var/run/ircd/ircd.pid"
-+
- #define SPATH		BINPATH "/ircd"			/* ircd executable */
- 
- #define CPATH		ETCPATH "/ircd.conf"		/* ircd.conf file */
-@@ -125,7 +127,6 @@
- #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 IRCDSSL_CPATH 	ETCPATH "/ircd.crt"		/* Client SSL */
- #define IRCDSSL_KPATH 	ETCPATH "/ircd.key"		/* Client SSL */
- 

Copied: ultimate-ircd/repos/community-x86_64/conf-fix.patch (from rev 127525, ultimate-ircd/trunk/conf-fix.patch)
===================================================================
--- community-x86_64/conf-fix.patch	                        (rev 0)
+++ community-x86_64/conf-fix.patch	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,25 @@
+--- ./config.h.org	2005-04-11 10:30:55.000000000 -0700
++++ ./config.h	2006-04-26 17:42:04.000000000 -0700
+@@ -110,10 +110,12 @@
+ /* dirs */
+ #define DPATH		IRCD_PREFIX                                                     
+ #define BINPATH		IRCD_PREFIX "/bin/"
+-#define ETCPATH		IRCD_PREFIX "/etc"
+-#define LOGPATH		IRCD_PREFIX "/logs"
++#define ETCPATH "/etc/ircd"
++#define LOGPATH "/var/log/ircd"
+ 
+ /* files */
++#define	PPATH		"/var/run/ircd/ircd.pid"
++
+ #define SPATH		BINPATH "/ircd"			/* ircd executable */
+ 
+ #define CPATH		ETCPATH "/ircd.conf"		/* ircd.conf file */
+@@ -125,7 +127,6 @@
+ #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 IRCDSSL_CPATH 	ETCPATH "/ircd.crt"		/* Client SSL */
+ #define IRCDSSL_KPATH 	ETCPATH "/ircd.key"		/* Client SSL */
+ 

Deleted: community-x86_64/ircd.install
===================================================================
--- community-x86_64/ircd.install	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-x86_64/ircd.install	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,31 +0,0 @@
-pre_install() {
-  /bin/true
-}
-
-post_install() {
-    groupadd irc
-    useradd -G irc -d /var/lib/ircd ircd
-    chown -R ircd.irc /var/log/ircd
-    chown -R ircd.irc /var/lib/ircd
-    chown -R ircd.irc /var/run/ircd
-}
-
-pre_upgrade() {
-  /bin/true
-}
-
-post_upgrade() {
-    chown -R ircd.irc /var/log/ircd
-    chown -R ircd.irc /var/lib/ircd
-    chown -R ircd.irc /var/run/ircd
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-    userdel ircd
-    groupdel irc
-}
-

Copied: ultimate-ircd/repos/community-x86_64/ircd.install (from rev 127525, ultimate-ircd/trunk/ircd.install)
===================================================================
--- community-x86_64/ircd.install	                        (rev 0)
+++ community-x86_64/ircd.install	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,13 @@
+post_install() {
+    groupadd -r irc
+    useradd -r -G irc -d /var/lib/ircd ircd
+    chown -R ircd:irc var/log/ircd
+    chown -R ircd:irc var/lib/ircd
+    chown -R ircd:irc var/run/ircd
+}
+
+post_upgrade() {
+    chown -R ircd:irc var/log/ircd
+    chown -R ircd:irc var/lib/ircd
+    chown -R ircd:irc var/run/ircd
+}

Deleted: community-x86_64/ultimate-ircd.service
===================================================================
--- community-x86_64/ultimate-ircd.service	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-x86_64/ultimate-ircd.service	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1,12 +0,0 @@
-[Unit]
-Description=IRC daemon
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=forking
-User=ircd
-PIDFile=/var/run/ircd/ircd.pid
-ExecStart=/usr/bin/ircd -f /etc/ircd/ircd.conf
-
-[Install]
-WantedBy=multi-user.target

Copied: ultimate-ircd/repos/community-x86_64/ultimate-ircd.service (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.service)
===================================================================
--- community-x86_64/ultimate-ircd.service	                        (rev 0)
+++ community-x86_64/ultimate-ircd.service	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1,12 @@
+[Unit]
+Description=IRC daemon
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+User=ircd
+PIDFile=/var/run/ircd/ircd.pid
+ExecStart=/usr/bin/ircd -f /etc/ircd/ircd.conf
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/ultimate-ircd.tmpfiles
===================================================================
--- community-x86_64/ultimate-ircd.tmpfiles	2015-02-10 17:46:02 UTC (rev 127525)
+++ community-x86_64/ultimate-ircd.tmpfiles	2015-02-10 17:46:22 UTC (rev 127526)
@@ -1 +0,0 @@
-d /run/ircd 0755 ircd irc -

Copied: ultimate-ircd/repos/community-x86_64/ultimate-ircd.tmpfiles (from rev 127525, ultimate-ircd/trunk/ultimate-ircd.tmpfiles)
===================================================================
--- community-x86_64/ultimate-ircd.tmpfiles	                        (rev 0)
+++ community-x86_64/ultimate-ircd.tmpfiles	2015-02-10 17:46:22 UTC (rev 127526)
@@ -0,0 +1 @@
+d /run/ircd 0755 ircd irc -



More information about the arch-commits mailing list