diff options
| -rw-r--r-- | sys-power/suspend/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-power/suspend/files/suspend-overflow-gentoo.patch | 42 | ||||
| -rw-r--r-- | sys-power/suspend/suspend-0.8-r1.ebuild | 53 |
3 files changed, 6 insertions, 97 deletions
diff --git a/sys-power/suspend/ChangeLog b/sys-power/suspend/ChangeLog index d7196f44521f..34e3cc0804fd 100644 --- a/sys-power/suspend/ChangeLog +++ b/sys-power/suspend/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/suspend -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.28 2014/03/01 22:15:50 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.29 2015/04/29 19:35:35 mrueg Exp $ + + 29 Apr 2015; Manuel Rüger <mrueg@gentoo.org> + -files/suspend-overflow-gentoo.patch, -suspend-0.8-r1.ebuild: + Remove old. 01 Mar 2014; Michał Górny <mgorny@gentoo.org> suspend-0.8-r1.ebuild, suspend-1.0.ebuild: diff --git a/sys-power/suspend/files/suspend-overflow-gentoo.patch b/sys-power/suspend/files/suspend-overflow-gentoo.patch deleted file mode 100644 index 92bbd11f1b49..000000000000 --- a/sys-power/suspend/files/suspend-overflow-gentoo.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urNd suspend-0.8/resume.c suspend-0.8~/resume.c ---- suspend-0.8/resume.c 2007-12-31 18:50:12.000000000 +0000 -+++ suspend-0.8~/resume.c 2009-03-20 01:24:33.000000000 +0000 -@@ -550,7 +550,7 @@ - struct swsusp_header *swsusp_header) - { - unsigned int size = sizeof(struct swsusp_header); -- unsigned int shift = (resume_offset + 1) * page_size - size; -+ off_t shift = (resume_offset + 1) * page_size - size; - int fd, ret; - - fd = open(resume_dev_name, O_RDWR); -@@ -585,7 +585,7 @@ - char *buffer = (char *)mem_pool + page_size; - unsigned int nr_pages = 0; - unsigned int size = sizeof(struct swsusp_header); -- unsigned int shift = (resume_offset + 1) * page_size - size; -+ off_t shift = (resume_offset + 1) * page_size - size; - char c; - - error = read_area(fd, header, swsusp_header->image, page_size); -diff -urNd suspend-0.8/suspend.c suspend-0.8~/suspend.c ---- suspend-0.8/suspend.c 2007-12-31 18:50:12.000000000 +0000 -+++ suspend-0.8~/suspend.c 2009-03-20 01:24:11.000000000 +0000 -@@ -587,7 +587,7 @@ - { - int error = 0; - unsigned int size = sizeof(struct swsusp_header); -- unsigned int shift = (resume_offset + 1) * page_size - size; -+ off_t shift = (resume_offset + 1) * page_size - size; - - if (lseek(fd, shift, SEEK_SET) != shift) - return -EIO; -@@ -757,7 +757,7 @@ - { - int ret, error = 0; - unsigned int size = sizeof(struct swsusp_header); -- unsigned int shift = (resume_offset + 1) * page_size - size; -+ off_t shift = (resume_offset + 1) * page_size - size; - - if (lseek(fd, shift, SEEK_SET) != shift) - return -EIO; diff --git a/sys-power/suspend/suspend-0.8-r1.ebuild b/sys-power/suspend/suspend-0.8-r1.ebuild deleted file mode 100644 index 110f538d2480..000000000000 --- a/sys-power/suspend/suspend-0.8-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-0.8-r1.ebuild,v 1.9 2014/03/01 22:15:50 mgorny Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="Userspace Software Suspend and S2Ram" -HOMEPAGE="http://suspend.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="fbsplash crypt" - -X86_RDEPEND="dev-libs/libx86" -X86_DEPEND=" - ${X86_RDEPEND} - >=sys-apps/pciutils-2.2.4" -RDEPEND=">=dev-libs/lzo-2[static-libs] - fbsplash? ( >=media-gfx/splashutils-1.5.2 ) - crypt? ( <dev-libs/libgcrypt-1.6.0:0[static-libs] - dev-libs/libgpg-error[static-libs] ) - x86? ( ${X86_RDEPEND} ) - amd64? ( ${X86_RDEPEND} )" -DEPEND="${RDEPEND} - x86? ( ${X86_DEPEND} ) - amd64? ( ${X86_DEPEND} ) - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/suspend-overflow-gentoo.patch -} - -src_configure() { - econf \ - --docdir="/usr/share/doc/${PF}" \ - --enable-compress \ - $(use_enable crypt encrypt) \ - $(use_enable fbsplash) \ - || die -} - -src_install() { - emake install DESTDIR="${D}" || die - prepalldocs -} - -pkg_postinst() { - elog "In order to make this package work with genkernel see:" - elog "http://bugs.gentoo.org/show_bug.cgi?id=156445" -} |