Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

5 files changed, 52 insertions, 5 deletions

diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD
index a3a440f..fe7e671 100755
--- a/abs/core/mythdb-initial/PKGBUILD
+++ b/abs/core/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythdb-initial
 pkgver=2
-pkgrel=3
+pkgrel=5
 pkgdesc="setup the initial mythtv database for linhes"
 url=""
 license=""
@@ -25,3 +25,11 @@ md5sums=('dee66a8d64b03f0f3f4adccd71a6bf1f'
          'ad0e57ac5e7c3677808a670e16634bba'
          'dd44c6b14247c9ad09b80f3a1fb6c339'
          'd3108f4b98229ceec53aa8fb72639e9b')
+md5sums=('dee66a8d64b03f0f3f4adccd71a6bf1f'
+         'ad0e57ac5e7c3677808a670e16634bba'
+         'de41ab94636ad9430ea9e046dd14da6c'
+         'd3108f4b98229ceec53aa8fb72639e9b')
+md5sums=('dee66a8d64b03f0f3f4adccd71a6bf1f'
+         'ad0e57ac5e7c3677808a670e16634bba'
+         '8b0fc984d879b100ae047c157604080b'
+         'd3108f4b98229ceec53aa8fb72639e9b')
diff --git a/abs/core/mythdb-initial/custom.sql b/abs/core/mythdb-initial/custom.sql
index 1033a9e..ccb40e4 100644
--- a/abs/core/mythdb-initial/custom.sql
+++ b/abs/core/mythdb-initial/custom.sql
@@ -1,3 +1,9 @@
+--
+DELETE FROM `settings` where `value`='HostMyhostname';
+--
+INSERT INTO `settings` (`value`,`data`,`hostname`) VALUES ('HostMyhostname','type_hostname_here','larch5');
+--
 INSERT INTO `jumppoints` (`destination`, `description`,`keylist`,`hostname`) VALUES
 ('MythSmolt','Hardware profiler','Ctrl+Alt+p','larch5')
 
+
diff --git a/abs/core/sysvinit/PKGBUILD b/abs/core/sysvinit/PKGBUILD
index 56d779f..110d93c 100644
--- a/abs/core/sysvinit/PKGBUILD
+++ b/abs/core/sysvinit/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux System V Init"
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/sysvinit"
@@ -12,12 +12,11 @@ license=('GPL')
 groups=('base')
 depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk')
 install=sysvinit.install
-source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2)
-md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f')
-sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26')
+source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 halt-init.patch)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}dsf"
+  patch -p0 < ${srcdir}/halt-init.patch
   make || return 1
 }
 
@@ -25,3 +24,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}dsf"
   make ROOT="${pkgdir}" install
 }
+md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f'
+         'cd4c5767f63ca5881e3e1f1c4f10f896')
diff --git a/abs/core/sysvinit/__changelog b/abs/core/sysvinit/__changelog
new file mode 100644
index 0000000..9dc0b73
--- /dev/null
+++ b/abs/core/sysvinit/__changelog
@@ -0,0 +1,20 @@
+patch halt to work with runit
+
+--- src/halt.c.orig     2008-08-30 17:25:02.000000000 +0000
++++ src/halt.c  2008-08-30 18:10:29.000000000 +0000
+@@ -186,6 +186,14 @@
+        if (!strcmp(progname, "reboot")) do_reboot = 1;
+        if (!strcmp(progname, "poweroff")) do_poweroff = 1;
+ 
++       if (!strcmp(progname, "reboot.init")) do_reboot = 1;
++       if (!strcmp(progname, "poweroff.init")) do_poweroff = 1;
++
++       //fprintf(stderr, "%d: do_reboot \n ", do_reboot);
++       //fprintf(stderr, "%d: do_poweroff \n ", do_poweroff);
++       //fprintf(stderr, "%s: \n", progname);
++       //do_nothing = 1;
++
+        /*
+         *      Get flags
+         */
+
diff --git a/abs/core/sysvinit/halt-init.patch b/abs/core/sysvinit/halt-init.patch
new file mode 100644
index 0000000..0885252
--- /dev/null
+++ b/abs/core/sysvinit/halt-init.patch
@@ -0,0 +1,12 @@
+--- src/halt.c.orig	2010-02-26 13:45:49.000000000 +0000
++++ src/halt.c	2010-12-02 17:42:51.000000000 +0000
+@@ -198,6 +198,9 @@
+ 	if (!strcmp(progname, "reboot")) do_reboot = 1;
+ 	if (!strcmp(progname, "poweroff")) do_poweroff = 1;
+ 
++	if (!strcmp(progname, "reboot.init")) do_reboot = 1;
++	if (!strcmp(progname, "poweroff.init")) do_poweroff = 1;
++
+ 	/*
+ 	 *	Get flags
+ 	 */