it works now

2 files changed, 7 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 825d0a96c7b8..c9aa0d66b443 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,12 +10,6 @@ pkgbase = openrc-sysvinit
 	license = GPL
 	depends = sysvinit
 	source = http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-2.98.tar.xz
-	source = 0001-simplify-writelog.patch
-	source = 0002-remove-ansi-escape-codes-from-log-file.patch
-	source = openrc-init.patch
 	md5sums = e3254f7622ea5cf2322b1b386a98ba59
-	md5sums = 26bfc38ccd225814ef9dd02842109df2
-	md5sums = a913d77f6554699bc074428cc6b07589
-	md5sums = f60460c6a3bc58376562fc76568bf3d7
 
 pkgname = openrc-sysvinit
diff --git a/PKGBUILD b/PKGBUILD
index f395fc16cd9d..662fac6922b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,33 +11,22 @@ arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/sysvinit"
 license=('GPL')
 groups=('base')
-source=(http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver}.tar.xz
-        "0001-simplify-writelog.patch"
-        "0002-remove-ansi-escape-codes-from-log-file.patch"
-        "openrc-init.patch")
-md5sums=('e3254f7622ea5cf2322b1b386a98ba59'
-         '26bfc38ccd225814ef9dd02842109df2'
-         'a913d77f6554699bc074428cc6b07589'
-         'f60460c6a3bc58376562fc76568bf3d7')
-
+source=(http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver}.tar.xz)
+md5sums=('e3254f7622ea5cf2322b1b386a98ba59')
 prepare() {
-  cd "$srcdir/sysvinit-${pkgver}dsf"
-
-  # FS#30005
-  patch -p1 -d "src" -i "$srcdir/0001-simplify-writelog.patch"
-  patch -p1 -d "src" -i "$srcdir/0002-remove-ansi-escape-codes-from-log-file.patch"
+  cd "$srcdir/sysvinit-${pkgver}"
 
-  # use /etc/openrc/inittab instead of /etc/inittab
-  patch -p1 -d "src" -i "$srcdir/openrc-init.patch"
+  # Use /etc/openrc/inittab to avoid conflicts
+  sed -i 's/\/etc\/inittab/\/etc\/openrc\/inittab/g' 'src/paths.h'
 }
 
 build() {
-  cd "$srcdir/sysvinit-${pkgver}dsf"
+  cd "$srcdir/sysvinit-${pkgver}"
   make -C src init
 }
 
 package() {
-  cd "$srcdir/sysvinit-${pkgver}dsf"
+  cd "$srcdir/sysvinit-${pkgver}"
   install -d "$pkgdir/usr/bin"
   install -m 755 src/init "$pkgdir/usr/bin/init-openrc"
 }