openrc-0.19-1: updating version

2 files changed, 74 insertions, 15 deletions

diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
index 96d3fb48a..b9f2bbfec 100644
--- a/pcr/openrc/PKGBUILD
+++ b/pcr/openrc/PKGBUILD
@@ -2,10 +2,12 @@
 # Contributor (Manjaro): williamh <williamh@gentoo.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-_rc_uri="https://github.com/OpenRC/openrc/archive"
+_url="https://github.com/OpenRC/openrc/archive"
+
+_use_mld_patch=true
 
 pkgname=openrc
-pkgver=0.18.4
+pkgver=0.19
 pkgrel=1
 pkgdesc="Gentoo's universal init system"
 arch=('i686' 'x86_64' 'armv7h')
@@ -25,38 +27,42 @@ backup=('etc/rc.conf'
         'etc/conf.d/modules'
         'etc/conf.d/hwclock'
         'etc/inittab')
-source=("${pkgname}-${pkgver}.tar.gz::${_rc_uri}/${pkgver}.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
 	"${pkgname}.logrotate"
 	'LICENSE')
-sha256sums=('99a4f7f7b6812f121ddd32936b6637f17e28e8ca727d590dbfdf4fb7aaba52a7'
+sha256sums=('799c62034dc5fa66c5dea6c0f642df9b755cbfae3938fccbd48c00ddd2c786d0'
             '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
             '28875cc6cb52e93657b96cf1bf0cc3b91891cdcbbc3196007c8cd93c6e22078f')
 
-_rc_args=(BRANDING="Parabola")
-_rc_args+=(SYSCONFDIR=/etc)
-_rc_args+=(PREFIX=/usr)
-_rc_args+=(SBINDIR=/usr/bin)
-_rc_args+=(LIBEXECDIR=/usr/lib/rc)
-_rc_args+=(MKSELINUX=no)
-_rc_args+=(MKPAM=pam)
-_rc_args+=(MKTERMCAP=ncurses)
-_rc_args+=(MKNET=no)
+${_use_mld_patch} && source+=('use-optional-modules-load-d.patch') \
+		&& sha256sums+=('54e0cfb59b83ad42ec85486b99b7fed52ccbc8f98f0f113668eacf48a24a2d03')
+
+_args=(BRANDING="Parabola")
+_args+=(SYSCONFDIR=/etc)
+_args+=(PREFIX=/usr)
+_args+=(SBINDIR=/usr/bin)
+_args+=(LIBEXECDIR=/usr/lib/rc)
+_args+=(MKSELINUX=no)
+_args+=(MKPAM=pam)
+_args+=(MKTERMCAP=ncurses)
+_args+=(MKNET=no)
 
 
 prepare(){
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab
+	${_use_mld_patch} && patch -Np1 -i ${srcdir}/use-optional-modules-load-d.patch 
 }
 
 build(){
 	# make openrc
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make "${_rc_args[@]}"
+	make "${_args[@]}"
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" "${_rc_args[@]}" install
+	make DESTDIR="${pkgdir}" "${_args[@]}" install
 
 	install -m644 "${srcdir}/${pkgname}-${pkgver}/support/sysvinit/inittab" "${pkgdir}/etc/inittab"
 	install -Dm644 "${srcdir}/${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
diff --git a/pcr/openrc/use-optional-modules-load-d.patch b/pcr/openrc/use-optional-modules-load-d.patch
new file mode 100644
index 000000000..7c91f032c
--- /dev/null
+++ b/pcr/openrc/use-optional-modules-load-d.patch
@@ -0,0 +1,53 @@
+--- ../conf.d/modules.orig	2015-07-06 01:50:49.893895158 +0200
++++ ../conf.d/modules	2015-07-06 01:27:49.000000000 +0200
+@@ -1,6 +1,11 @@
+ # You can define a list modules for a specific kernel version,
+ # a released kernel version, a main kernel version or just a list.
+ # The most specific versioned variable will take precedence.
++
++# if openrc should make use of /etc/modules-load.d
++# systemd places stuff there
++use_modules_load_d=false
++
+ #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
+ #modules_2_6_23="tun ieee1394"
+ #modules_2_6="tun"
+
+--- ../init.d/modules.in.orig	2015-06-19 16:55:37.000000000 +0200
++++ ../init.d/modules.in	2015-07-06 01:30:29.154313412 +0200
+@@ -16,6 +16,35 @@
+ 	# support compiled in ...
+ 	[ ! -f /proc/modules ] && return 0
+
++	if ${use_modules_load_d};then
++		local conf_s=/etc/modules-load.d
++		einfo "using ${conf_s}"
++		local conf_rc=/etc/conf.d/modules
++		mv ${conf_rc} ${conf_rc}.lastboot
++		touch ${conf_rc}
++		echo "use_modules_load_d=${use_modules_load_d}" >> ${conf_rc}
++		if [[ -d ${conf_s} ]] && [[ -f ${conf_s}/mhwd-gpu.conf ]]; then
++			local mods=() mhwd=() fn= kv=
++			for m in $(cat ${conf_s}/mhwd-gpu.conf | sed '/^.*#/d'); do
++				mhwd+=("$m")
++			done
++			for f in $(ls ${conf_s}/*.conf); do
++				if [[ $fn != mhwd-gpu ]];then
++					fn=${f##*/}
++					fn=${fn%%.conf}
++					kv=${fn//-*}
++					kv=${kv##linux}
++					for m in $(cat $f | sed '/^.*#/d'); do
++						mods+=("$m")
++					done
++					[[ $fn == linux${kv}-* ]] && echo 'modules_'${kv:0:1}'_'${kv:1:2}'="'${mods[@]} ${mhwd[@]}'"' >> ${conf_rc}
++					echo '' >> ${conf_rc}
++					mods=()
++				fi
++			done
++		fi
++	fi
++
+ 	local KV x y kv_variant_list
+ 	KV=$(uname -r)
+ 	# full $KV