summaryrefslogtreecommitdiff
path: root/pcr/initng-git
diff options
context:
space:
mode:
Diffstat (limited to 'pcr/initng-git')
-rw-r--r--pcr/initng-git/PKGBUILD64
-rw-r--r--pcr/initng-git/fixes.patch31
-rw-r--r--pcr/initng-git/initng-paths.h7
3 files changed, 36 insertions, 66 deletions
diff --git a/pcr/initng-git/PKGBUILD b/pcr/initng-git/PKGBUILD
index baa877648..f50687ffd 100644
--- a/pcr/initng-git/PKGBUILD
+++ b/pcr/initng-git/PKGBUILD
@@ -1,51 +1,45 @@
+# Maintainer (Arch): Zsolt Udvari <udvzsolt gmail com>
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Jens Staal <staal1978@gmail.com>
-_pkgname=initng
pkgname=initng-git
-pkgver=20120517.1043
+_gitname="initng"
+pkgver=774.3d82abc
+pkgrel=1
pkgdesc="A full replacement for the old System V Init system"
-url="http://initng.org/"
+arch=('i686' 'x86_64')
+url="http://initng.sourceforge.net/trac"
license=('GPL3')
-
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-provides=('init')
-depends=('dbus')
-makedepends=('git' 'acr' 'ftjam' 'makepkg-git')
-optdepends=('ncurses')
+makedepends=('git' 'acr' 'ftjam' 'dbus')
+optdepdends=('ncurses')
options=(!strip)
-source=('git://github.com/initng/initng.git' fixes.patch)
-backup=(etc/initng/killall5-ignore)
+source=(git://github.com/initng/${_gitname}.git
+ initng-paths.h
+)
+md5sums=('SKIP'
+ '3336bc8037273a3e007891d09967a627')
pkgver() {
- cd "$srcdir/$_pkgname"
- date -u +%Y%m%d.%H%M -d "$(git log -n1 --date=iso --format=format:'%cd')"
+ cd $_gitname
+ echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
}
build() {
- cd "$srcdir/$_pkgname"
- patch -Np1 -i "$srcdir/fixes.patch"
+ rm -rf $srcdir/build #start fresh
+ cp -ar $srcdir/initng $srcdir/build
+ cd $srcdir/build
+ cp ${srcdir}/initng-paths.h .
+ sed -i "s|includedir=.*|&/libinitng-@VERSION@|" initng.pc.acr
+ sed -i "s/_BSD_SOURCE/_DEFAULT_SOURCE/g" \
+ src/modules/chroot/initng_chroot.c \
+ src/modules/fmon/initng_fmon.c \
+ src/modules/netdev/initng_netdev.c \
+ src/modules/suid/initng_suid.c
acr
- ./configure --prefix="/usr" --sbindir=/sbin --sysconfdir=/etc
- jam
+ ./configure --prefix="/usr"
+ make
}
package() {
- cd "$srcdir/$_pkgname"
-
- jam install DESTDIR="$pkgdir"
- find "$pkgdir"/usr/lib -type f -name '*.so*' -exec chmod 755 {} +
- find "$pkgdir"/sbin -type f -exec chmod 755 {} +
- pushd "$pkgdir"/usr/lib
- ln -s libngeclient.so.* libngeclient.so.0
- ln -s libngcclient.so.* libngcclient.so.0
- popd
-
- install -d "$pkgdir"/usr/share/licenses/initng
- install -m644 COPYING "$pkgdir"/usr/share/licenses/initng/
- install -m644 AUTHORS "$pkgdir"/usr/share/licenses/initng/
+ cd $srcdir/build
+ make install DESTDIR=$pkgdir
}
-
-md5sums=('SKIP'
- 'bf6d17e00c5f0d85d99b7184980528ad')
diff --git a/pcr/initng-git/fixes.patch b/pcr/initng-git/fixes.patch
deleted file mode 100644
index 397965e38..000000000
--- a/pcr/initng-git/fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru initng.orig/include/initng/io.h initng/include/initng/io.h
---- initng.orig/include/initng/io.h 2012-12-11 03:45:20.000000000 -0500
-+++ initng/include/initng/io.h 2012-12-11 03:44:30.000000000 -0500
-@@ -21,6 +21,7 @@
- #define INITNG_IO_H
-
- #include <unistd.h>
-+#include <stdbool.h>
- #include <fcntl.h>
-
- #include <initng/active_db.h>
-@@ -43,6 +44,6 @@
- pipe_h * pipe);
- void initng_io_module_poll(int timeout);
-
--int initng_io_set_cloexec(int fd);
-+/* int initng_io_set_cloexec(int fd); */
-
- #endif /* !defined(INITNG_IO_H) */
-diff -ru initng.orig/src/main/io/open.c initng/src/main/io/open.c
---- initng.orig/src/main/io/open.c 2012-12-11 03:45:20.000000000 -0500
-+++ initng/src/main/io/open.c 2012-12-11 03:44:30.000000000 -0500
-@@ -26,8 +26,5 @@
- int fd;
-
- fd = open(path, flags);
-- if (fd != -1) {
-- initng_io_fdtrack(fd);
-- }
- return fd;
- }
diff --git a/pcr/initng-git/initng-paths.h b/pcr/initng-git/initng-paths.h
new file mode 100644
index 000000000..96decfc9c
--- /dev/null
+++ b/pcr/initng-git/initng-paths.h
@@ -0,0 +1,7 @@
+#ifndef INITNG_PATHS_H
+#define INITNG_PATHS_H
+
+#define DEVDIR "/dev"
+#define INITNG_PLUGIN_DIR "/usr/lib/initng"
+
+#endif /* INITNG_PATHS_H */