summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2009-04-06 19:18:43 +0000
committerMichael Januszewski <spock@gentoo.org>2009-04-06 19:18:43 +0000
commitd5804eaa888355e0b6e510a792d99f55062a042f (patch)
treeebdf2634f01f5a353b171a324037bfc7b7b9c1e9 /media-gfx/splashutils
parentAdded patch to fix the buffer overflow that kills slirpvde under fortify. (diff)
downloadhistorical-d5804eaa888355e0b6e510a792d99f55062a042f.tar.gz
historical-d5804eaa888355e0b6e510a792d99f55062a042f.tar.bz2
historical-d5804eaa888355e0b6e510a792d99f55062a042f.zip
Fix the problem of the progress bar not reaching 100% during reboot.
Package-Manager: portage-2.1.6.11/cvs/Linux x86_64 RepoMan-Options: --force
Diffstat (limited to 'media-gfx/splashutils')
-rw-r--r--media-gfx/splashutils/ChangeLog7
-rw-r--r--media-gfx/splashutils/Manifest11
-rw-r--r--media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch29
-rw-r--r--media-gfx/splashutils/splashutils-1.5.4.3.ebuild6
4 files changed, 45 insertions, 8 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index e3d5134d7d14..107244f47a1d 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/splashutils
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.155 2009/03/25 21:43:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.156 2009/04/06 19:18:43 spock Exp $
+
+ 06 Apr 2009; Michał Januszewski <spock@gentoo.org>
+ +files/splashutils-1.5.4.3-openrc-umount-fix.patch,
+ splashutils-1.5.4.3.ebuild:
+ Fix the problem of the progress bar not reaching 100% during reboot.
25 Mar 2009; Michał Januszewski <spock@gentoo.org>
+files/splashutils-openrc-0.4.3-runlevel-fix.patch,
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 581027d4aece..0d9718678d2d 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 RMD160 d60bdea6625c9ce4d42d281c38888b8bcb823525 SHA1 31b831b79ea3944a52d0ca9fd45891c73170c758 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8
AUX splashutils-1.5.4.3-makefile.patch 1257 RMD160 1fb565cb543efe438f5c47cf490aa3cffe07d559 SHA1 011baf9ea9c1313edb3045dc7a52c28d3b84c83e SHA256 6ca31fc77f75bda368642da7effbaa0fd3c69bce86c9e04bfe55b9ab4d259cf3
+AUX splashutils-1.5.4.3-openrc-umount-fix.patch 1152 RMD160 a5acc1c648ca41d1aabe823c6e44aad53a1bc965 SHA1 98c6233e367a54e137ef1637725924a8a2d32871 SHA256 56f48bd31c0d405abbb2d320c131f109fcf6ee7a2ef5bed00b024dd872ef31ea
AUX splashutils-openrc-0.4-fix.patch 2750 RMD160 b9e7694c7e2d2083e62f321f232be9054696f06b SHA1 1d3c6c7418a0ada751dec57dff075af709f0b383 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846
AUX splashutils-openrc-0.4.3-runlevel-fix.patch 3472 RMD160 2e45065be3e8f670034df92a83e6c8ee9f8fb237 SHA1 a4d7bae4844070697091f84bd4a7602b8eabab26 SHA256 9e122dc031acee6996375170ae8954a0ea78cc99ba9265ab2e4ba540da25cb94
DIST freetype-2.3.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
@@ -15,13 +16,13 @@ DIST splashutils-lite-1.5.4.2.tar.bz2 421894 RMD160 defb12e3cedccbfd3f3ebdf75305
DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
EBUILD splashutils-1.5.4.2.ebuild 6931 RMD160 3507bd940bad5862407494ffa98de5eabb99910c SHA1 b7156e7cf6af6694b1dd008f795134d2fb479aec SHA256 a9b68b86ddbb85153c3ecf32210bc61d9ebb91e92d7816bfe9cde646d9ff4236
-EBUILD splashutils-1.5.4.3.ebuild 7229 RMD160 639d15f1b5bc1f6ac17e8e6fea527c35792f7262 SHA1 626b24286a4e8f76ea82eb19f46b63f1bb1f3c1a SHA256 bb743463f09df9c81fd72d3d1692934776448e323a59a84d38d1dd56f433de0d
-MISC ChangeLog 29087 RMD160 8722818b326b88c9c94c52e17fb7dc55fa15a23e SHA1 d42e2faa529ae8570a3d10f058c92d28bacfe361 SHA256 afbc0af28fc4771a9b3a393947e0024fd3b5cb5edfa6d11c0c508780d4986827
+EBUILD splashutils-1.5.4.3.ebuild 7338 RMD160 ea6cce40a2aa71d4f5fc076ff8d471eda88c96a7 SHA1 b7241cce15fcadec757fcff736bf2d605c9667bf SHA256 8c981107daaa0e5448064ce731f0afe21a6283be26be3325b4f443bea5d46ae8
+MISC ChangeLog 29297 RMD160 1f8abe3878037c56f8ca7ef527a6e57a927b5262 SHA1 821d5bf2729adfd20556046101739149c04d6115 SHA256 1734b88ef12a09e25f3b425196ba17e24c735f828339c47aba104f704973bbe7
MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAknKpZIACgkQchej4aZK9/flGQCdGDCfNxQ6NXv6hRd+u1CAy8S+
-x+MAn2BK5sUpDDblVim7+Rgf0G7TboXn
-=xQyx
+iEYEARECAAYFAknaVY8ACgkQchej4aZK9/dNQQCfb9azJDa3VrB4oeyL88x/0dGS
+HcUAnjqp7caOPQfV0Rut8Kxr1OEDS/kL
+=jCwh
-----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch
new file mode 100644
index 000000000000..dcb1ef99440c
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch
@@ -0,0 +1,29 @@
+commit ae4b5cc9c2d904e18db51876d9bd292504714600
+Author: Michał Januszewski <spock@gentoo.org>
+Date: Mon Apr 6 20:59:48 2009 +0200
+
+ Prevent umounting of theme directories.
+
+ Some themes dynamically modify themselves during boot. In order to be
+ able to do that, they mount a tmpfs in their main directory. Prevent
+ openrc from umounting this directory when rebooting.
+
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index 048e0ec..d831d0c 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -968,10 +968,10 @@ do_start:
+ if (name && !strcmp(name, "localmount")) {
+ char *umounts = getenv("RC_NO_UMOUNTS");
+
+- if (umounts)
+- fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:%s", umounts, FBSPLASH_CACHEDIR);
+- else
+- fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s", FBSPLASH_CACHEDIR);
++ if (umounts)
++ fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:" FBSPLASH_CACHEDIR ":/etc/splash/%s", umounts, config->theme);
++ else
++ fprintf(rc_environ_fd, "RC_NO_UMOUNTS=" FBSPLASH_CACHEDIR ":/etc/splash/%s", config->theme);
+ }
+ i = splash_svc_handle(name, "svc_stop", false);
+ break;
diff --git a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
index 635d3b39142e..2cd72d9aa01f 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.8 2009/03/25 21:43:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.9 2009/04/06 19:18:43 spock Exp $
EAPI="1"
@@ -94,6 +94,7 @@ src_unpack() {
fi
fi
epatch "${FILESDIR}"/splashutils-1.5.4.3-fix_rc_var.patch
+ epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-umount-fix.patch
cd "${S}"
rm -f m4/*
@@ -116,7 +117,8 @@ src_compile() {
--with-freetype2-src=${FT2SRC} \
--with-jpeg-src=${JPEGSRC} \
--with-lpng-src=${LPNGSRC} \
- --with-zlib-src=${ZLIBSRC} || die "failed to configure splashutils"
+ --with-zlib-src=${ZLIBSRC} \
+ --with-essential-libdir=/$(get_libdir) || die "failed to configure splashutils"
emake CC="${CC}" STRIP="true" || die "failed to build splashutils"