[arch-commits] Commit in ultimate-ircd/repos (22 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Mon May 13 14:39:21 UTC 2013
Date: Monday, May 13, 2013 @ 16:39:21
Author: spupykin
Revision: 90729
archrelease: copy trunk to community-i686, community-x86_64
Added:
ultimate-ircd/repos/community-i686/PKGBUILD
(from rev 90728, ultimate-ircd/trunk/PKGBUILD)
ultimate-ircd/repos/community-i686/conf-fix.patch
(from rev 90728, ultimate-ircd/trunk/conf-fix.patch)
ultimate-ircd/repos/community-i686/ircd.install
(from rev 90728, ultimate-ircd/trunk/ircd.install)
ultimate-ircd/repos/community-i686/ultimate-ircd.service
(from rev 90728, ultimate-ircd/trunk/ultimate-ircd.service)
ultimate-ircd/repos/community-i686/ultimate-ircd.tmpfiles
(from rev 90728, ultimate-ircd/trunk/ultimate-ircd.tmpfiles)
ultimate-ircd/repos/community-x86_64/PKGBUILD
(from rev 90728, ultimate-ircd/trunk/PKGBUILD)
ultimate-ircd/repos/community-x86_64/conf-fix.patch
(from rev 90728, ultimate-ircd/trunk/conf-fix.patch)
ultimate-ircd/repos/community-x86_64/ircd.install
(from rev 90728, ultimate-ircd/trunk/ircd.install)
ultimate-ircd/repos/community-x86_64/ultimate-ircd.service
(from rev 90728, ultimate-ircd/trunk/ultimate-ircd.service)
ultimate-ircd/repos/community-x86_64/ultimate-ircd.tmpfiles
(from rev 90728, 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
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
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 | 62 +++++++++++++++
/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 | 54 -------------
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 | 54 -------------
community-x86_64/ultimate-ircd.service | 12 --
community-x86_64/ultimate-ircd.tmpfiles | 1
17 files changed, 260 insertions(+), 368 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-i686/PKGBUILD 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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=6
-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
- ultimate-ircd.service
- ultimate-ircd.tmpfiles
- conf-fix.patch)
-md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
- 'cf6ab14d8dd8805342b70a9beb01c9af'
- '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
-
- 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 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd
- 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 90728, ultimate-ircd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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=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
+}
Deleted: community-i686/conf-fix.patch
===================================================================
--- community-i686/conf-fix.patch 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-i686/conf-fix.patch 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 90728, ultimate-ircd/trunk/conf-fix.patch)
===================================================================
--- community-i686/conf-fix.patch (rev 0)
+++ community-i686/conf-fix.patch 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-i686/ircd.install 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 90728, ultimate-ircd/trunk/ircd.install)
===================================================================
--- community-i686/ircd.install (rev 0)
+++ community-i686/ircd.install 2013-05-13 14:39:21 UTC (rev 90729)
@@ -0,0 +1,31 @@
+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
+}
+
Deleted: community-i686/ultimate-ircd
===================================================================
--- community-i686/ultimate-ircd 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-i686/ultimate-ircd 2013-05-13 14:39:21 UTC (rev 90729)
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
- pidof /usr/bin/ircd
-}
-
-case "$1" in
- start)
- stat_busy "Starting Ultimate IRCd"
-
- [ -d /var/run/ircd ] || mkdir -p /var/run/ircd
- [ -f /var/run/ircd/ircd.pid ] && rm -f /var/run/ircd/ircd.pid
- PID=`get_pid`
- if [ -z "$PID" ]; then
- su -c '/usr/bin/ircd -f /etc/ircd/ircd.conf' ircd 1>>/var/log/ircd/stdout.log 2>>/var/log/ircd/sterr.log
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon ultimate-ircd
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping Ultimate IRCd"
- PID=`get_pid`
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/ircd/ircd.pid &> /dev/null
- rm_daemon ultimate-ircd
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: community-i686/ultimate-ircd.service
===================================================================
--- community-i686/ultimate-ircd.service 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-i686/ultimate-ircd.service 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 90728, ultimate-ircd/trunk/ultimate-ircd.service)
===================================================================
--- community-i686/ultimate-ircd.service (rev 0)
+++ community-i686/ultimate-ircd.service 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-i686/ultimate-ircd.tmpfiles 2013-05-13 14:39:21 UTC (rev 90729)
@@ -1 +0,0 @@
-d /run/ircd 0755 ircd irc -
Copied: ultimate-ircd/repos/community-i686/ultimate-ircd.tmpfiles (from rev 90728, ultimate-ircd/trunk/ultimate-ircd.tmpfiles)
===================================================================
--- community-i686/ultimate-ircd.tmpfiles (rev 0)
+++ community-i686/ultimate-ircd.tmpfiles 2013-05-13 14:39:21 UTC (rev 90729)
@@ -0,0 +1 @@
+d /run/ircd 0755 ircd irc -
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-x86_64/PKGBUILD 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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=6
-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
- ultimate-ircd.service
- ultimate-ircd.tmpfiles
- conf-fix.patch)
-md5sums=('8bc14b97d22a3ce3415cc0540ae459f6'
- 'cf6ab14d8dd8805342b70a9beb01c9af'
- '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
-
- 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 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd
- 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 90728, ultimate-ircd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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=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
+}
Deleted: community-x86_64/conf-fix.patch
===================================================================
--- community-x86_64/conf-fix.patch 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-x86_64/conf-fix.patch 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 90728, ultimate-ircd/trunk/conf-fix.patch)
===================================================================
--- community-x86_64/conf-fix.patch (rev 0)
+++ community-x86_64/conf-fix.patch 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-x86_64/ircd.install 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 90728, ultimate-ircd/trunk/ircd.install)
===================================================================
--- community-x86_64/ircd.install (rev 0)
+++ community-x86_64/ircd.install 2013-05-13 14:39:21 UTC (rev 90729)
@@ -0,0 +1,31 @@
+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
+}
+
Deleted: community-x86_64/ultimate-ircd
===================================================================
--- community-x86_64/ultimate-ircd 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-x86_64/ultimate-ircd 2013-05-13 14:39:21 UTC (rev 90729)
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
- pidof /usr/bin/ircd
-}
-
-case "$1" in
- start)
- stat_busy "Starting Ultimate IRCd"
-
- [ -d /var/run/ircd ] || mkdir -p /var/run/ircd
- [ -f /var/run/ircd/ircd.pid ] && rm -f /var/run/ircd/ircd.pid
- PID=`get_pid`
- if [ -z "$PID" ]; then
- su -c '/usr/bin/ircd -f /etc/ircd/ircd.conf' ircd 1>>/var/log/ircd/stdout.log 2>>/var/log/ircd/sterr.log
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- add_daemon ultimate-ircd
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping Ultimate IRCd"
- PID=`get_pid`
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/ircd/ircd.pid &> /dev/null
- rm_daemon ultimate-ircd
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: community-x86_64/ultimate-ircd.service
===================================================================
--- community-x86_64/ultimate-ircd.service 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-x86_64/ultimate-ircd.service 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 90728, ultimate-ircd/trunk/ultimate-ircd.service)
===================================================================
--- community-x86_64/ultimate-ircd.service (rev 0)
+++ community-x86_64/ultimate-ircd.service 2013-05-13 14:39:21 UTC (rev 90729)
@@ -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 2013-05-13 14:38:53 UTC (rev 90728)
+++ community-x86_64/ultimate-ircd.tmpfiles 2013-05-13 14:39:21 UTC (rev 90729)
@@ -1 +0,0 @@
-d /run/ircd 0755 ircd irc -
Copied: ultimate-ircd/repos/community-x86_64/ultimate-ircd.tmpfiles (from rev 90728, ultimate-ircd/trunk/ultimate-ircd.tmpfiles)
===================================================================
--- community-x86_64/ultimate-ircd.tmpfiles (rev 0)
+++ community-x86_64/ultimate-ircd.tmpfiles 2013-05-13 14:39:21 UTC (rev 90729)
@@ -0,0 +1 @@
+d /run/ircd 0755 ircd irc -
More information about the arch-commits
mailing list