OpenRC: update to 0.5.2.

xbps changes:
 * Add patch to suppress warnings from /etc/init.d/keymaps.
 * Add patch to avoid rpath.
 * Comment out default staticroute setting in /etc/conf.d/staticroute,
   to avoid errors.

--HG--
extra : convert_revision : fdb16da4e43d3ac434ca7560234f552a3bb19215
This commit is contained in:
Juan RP 2009-10-21 11:26:13 +02:00
parent fd065e5562
commit b13b7598aa
3 changed files with 53 additions and 17 deletions

View file

@ -0,0 +1,21 @@
--- init.d/keymaps.in.orig 2009-10-20 15:37:48.000000000 +0200
+++ init.d/keymaps.in 2009-10-20 15:41:09.000000000 +0200
@@ -42,7 +42,8 @@ start()
msg="UTF-8"
fi
yesno $windowkeys && wkeys="windowkeys"
- loadkeys -q $loadkeys_uni $wkeys $keymap $extended_keymaps
+ loadkeys -q $loadkeys_uni $wkeys $keymap \
+ $extended_keymaps > dev/null 2>&1
eend $? "Error loading key mappings" || return $?
if yesno $fix_euro; then
@@ -57,7 +58,7 @@ start()
ebegin "Setting keyboard mode [$msg]"
if yesno $unicode; then
dumpkeys ${dumpkeys_charset:+-c} \
- $dumpkeys_charset | loadkeys --unicode
+ $dumpkeys_charset | loadkeys --unicode >/dev/null 2>&1
fi
n=1
while [ $n -le $ttyn ]; do

View file

@ -38,18 +38,6 @@ xbps changes:
# new-style single-user
.Linux.in:
--- src/rc/rc.c.orig 2009-06-20 08:14:19.018885584 +0200
+++ src/rc/rc.c 2009-06-20 08:13:52.000000000 +0200
@@ -45,6 +45,9 @@ const char rc_copyright[] = "Copyright (
#ifdef __linux__
# include <asm/setup.h> /* for COMMAND_LINE_SIZE */
+# ifndef COMMAND_LINE_SIZE
+# define COMMAND_LINE_SIZE 2048
+# endif
#endif
#include <errno.h>
--- conf.d/keymaps.orig 2009-10-09 17:09:02.537481085 +0200
+++ conf.d/keymaps 2009-10-09 17:12:19.694535631 +0200
@@ -1,10 +1,14 @@
@ -116,3 +104,31 @@ xbps changes:
# Network fstypes. Below is the default.
net_fs_list="afs cifs coda davfs fuse gfs ncpfs nfs nfs4 ocfs2 shfs smbfs"
--- conf.d/staticroute.Linux.orig 2009-10-21 10:58:05.000000000 +0200
+++ conf.d/staticroute.Linux 2009-10-21 10:58:17.000000000 +0200
@@ -1,2 +1,3 @@
# Example static route. See route(8) for syntax.
-staticroute="net 192.168.0.0 netmask 255.255.0.0 gw 10.73.1.1"
+#
+#staticroute="net 192.168.0.0 netmask 255.255.0.0 gw 10.73.1.1"
--- mk/prog.mk.orig 2009-10-21 11:00:28.000000000 +0200
+++ mk/prog.mk 2009-10-21 11:00:36.000000000 +0200
@@ -17,7 +17,6 @@ _DYNLINK_SH= if test "${PREFIX}" = "" &
fi
_DYNLINK!= ${_DYNLINK_SH}
LDFLAGS+= ${_DYNLINK}$(shell ${_DYNLINK_SH})
-LDFLAGS+= -Wl,-rpath=${PREFIX}/${LIBNAME}
LDFLAGS+= ${PROGLDFLAGS}
CLEANFILES+= ${OBJS} ${PROG}
--- mk/lib.mk.orig 2009-10-21 11:00:57.000000000 +0200
+++ mk/lib.mk 2009-10-21 11:01:17.000000000 +0200
@@ -32,7 +32,7 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
${SHLIB_NAME}: ${VERSION_MAP}
LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
# We need to ensure we use libraries in /lib
-LDFLAGS+= -L/${LIBNAME} -Wl,-rpath=/${LIBNAME}
+LDFLAGS+= -L/${LIBNAME}
${SHLIB_NAME}: ${SOBJS}
@${ECHO} building shared library $@

View file

@ -1,13 +1,12 @@
# Template file for 'OpenRC'
pkgname=OpenRC
version=0.5.0
revision=4
version=0.5.2
wrksrc=openrc-${version}
distfiles="http://roy.marples.name/downloads/openrc/openrc-$version.tar.bz2"
build_style=gnu_makefile
short_desc="Universal init system"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=168a19c38572e8f822137676eeae6233b507c8b8efcf19421cdc8675fc22e4c1
checksum=0633f5cc8c0f055a292722b36108cebbe1925f164df8c0d2688dd376e6f0e18c
long_desc="
OpenRC is a dependency based init system that works with the system
provided init program, normally /sbin/init. It is not a replacement for
@ -21,13 +20,13 @@ conf_files="/etc/rc.conf /etc/conf.d/bootmisc /etc/conf.d/consolefont
/etc/conf.d/dmesg /etc/conf.d/fsck /etc/conf.d/hostname /etc/conf.d/hwclock
/etc/conf.d/keymaps /etc/conf.d/local /etc/conf.d/locale
/etc/conf.d/localmount /etc/conf.d/modules /etc/conf.d/network
/etc/conf.d/urandom /etc/inittab"
/etc/conf.d/urandom /etc/conf.d/staticroutes /etc/inittab"
Add_dependency full glibc
Add_dependency full psmisc
Add_dependency full sysvinit
pre_configure()
pre_build()
{
# Install the "locale" service
cp ${FILESDIR}/locale.rc ${wrksrc}/init.d/locale.in