* [gentoo-commits] repo/gentoo:master commit in: sys-power/suspend/files/, sys-power/suspend/
@ 2016-08-18 9:36 Andrew Savchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Savchenko @ 2016-08-18 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 440c8f9a2065b130a82e84f48c31fb56b7413c4a
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 09:35:09 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 09:36:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=440c8f9a
sys-power/suspend: remove old version depending on vulnerable libgcrypt
Package-Manager: portage-2.3.0
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
sys-power/suspend/Manifest | 1 -
.../suspend/files/suspend-1.0-automake-1.13.patch | 11 ----
sys-power/suspend/files/suspend-1.0-bzip2.patch | 37 -------------
sys-power/suspend/files/suspend-1.0-errno.patch | 10 ----
sys-power/suspend/suspend-1.0.ebuild | 60 ----------------------
5 files changed, 119 deletions(-)
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index fc9083f..220e4a2 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,3 +1,2 @@
DIST suspend-1.0_p20120915.tar.xz 111080 SHA256 4fa7551ec5ce3ed5d7412ad14e01f5fbac3a541db9d94ad6adf20b87d9c32eca SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be WHIRLPOOL 6f5ea4a17572bc1e30d70258a0439b40a29ea67f0251cecec81bdd3dee92e7801645c37dbb868b0f498c093193bd574f361dc015810965c09f53d75cfb391e7f
DIST suspend-1.0_p20150810.patch.xz 6172 SHA256 5a07235c805dd3bb043ccc5ec1c18a3ca195912ea05fd3c007845825ebe3ed78 SHA512 cb186bdb0619ed4852e2ba12d6048f26fa23c7556d7c95713f14a4258fbb014bbec2281edee6478ebf5916600b674d47d8ba53e7644391de933b03e9fd1b96e9 WHIRLPOOL b1d9ba65f02ed4b507a586b5df71b897c147599db51905285cf55037e7c316f0392df432c81c99660abd7616dd60a816c4c2234bac3745eda84f6499cff7bdf4
-DIST suspend-utils-1.0.tar.bz2 408451 SHA256 0206ba6332860b6da57acc79cc0f8604150ef0835ff9633fd42d59d181a6c85d SHA512 481f7ab6e6d43b963cf7abf4d16a9911035dbce13d96e11eeadd50bbd2b9671c597eab0e3060536dcb0d6d848e30ac0e7ff534275fc2d66d2064b75066a4adb8 WHIRLPOOL 4321dcaeda4b5b7d822a1cade82b88094d8706d0daaa06b72d3c053a4bac14ed85b55a4681e0a52f116a63e3b8f4255c57e55fb43961f77149faf1b8aa918d58
diff --git a/sys-power/suspend/files/suspend-1.0-automake-1.13.patch b/sys-power/suspend/files/suspend-1.0-automake-1.13.patch
deleted file mode 100644
index 8aacea5..0000000
--- a/sys-power/suspend/files/suspend-1.0-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- suspend-utils-1.0/configure.ac
-+++ suspend-utils-1.0/configure.ac
-@@ -9,7 +9,7 @@
- AC_PREREQ([2.59])
- AC_INIT([suspend-utils], [1.0])
- AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_SRCDIR([suspend.c])
-
- AC_CANONICAL_HOST
diff --git a/sys-power/suspend/files/suspend-1.0-bzip2.patch b/sys-power/suspend/files/suspend-1.0-bzip2.patch
deleted file mode 100644
index abe5afa..0000000
--- a/sys-power/suspend/files/suspend-1.0-bzip2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile.am 2011-03-07 00:24:15.000000000 +0100
-+++ b/Makefile.am 2012-05-22 10:52:49.023010001 +0200
-@@ -171,7 +171,8 @@
- fbsplash_funcs.c \
- fbsplash-test.c
- fbsplash_test_LDADD=\
-- $(FBSPLASH_LIBS)
-+ $(FBSPLASH_LIBS) \
-+ $(BZ2_LIBS)
-
- whitelist.c: whitelist.csv
- $(PERL) wlcsv2c.pl whitelist.csv whitelist.c
---- a/configure.ac 2011-03-07 00:24:15.000000000 +0100
-+++ b/configure.ac 2012-05-22 10:52:37.918148832 +0200
-@@ -74,6 +74,22 @@
- ,
- [enable_fbsplash="no"]
- )
-+BZ2_LIBS=
-+AS_IF(
-+ [test "x${fbsplash}" = "xyes"],
-+ [
-+ PKG_CHECK_MODULES(
-+ [FREETYPE2],
-+ [freetype2],
-+ ,
-+ [AC_MSG_ERROR([freetype was not found.])]
-+ )
-+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress],
-+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"],
-+ [AC_MSG_ERROR(['libbz2' library was not found.])]
-+ )
-+ ]
-+)
- AC_ARG_WITH(
- [devdir],
- [AC_HELP_STRING([--with-devdir=DIR], [use if --enable-create-device, put devices in this directory, default /dev])],
diff --git a/sys-power/suspend/files/suspend-1.0-errno.patch b/sys-power/suspend/files/suspend-1.0-errno.patch
deleted file mode 100644
index ea8a378..0000000
--- a/sys-power/suspend/files/suspend-1.0-errno.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- swsusp.h.orig 2010-10-03 13:40:47.000000000 -0600
-+++ swsusp.h 2010-10-04 14:38:38.000000000 -0600
-@@ -11,6 +11,7 @@
-
- #include <stdint.h>
- #include <linux/fs.h>
-+#include <errno.h>
-
- #include "suspend_ioctls.h"
- #include "encrypt.h"
diff --git a/sys-power/suspend/suspend-1.0.ebuild b/sys-power/suspend/suspend-1.0.ebuild
deleted file mode 100644
index bec1c7e..0000000
--- a/sys-power/suspend/suspend-1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Userspace Software Suspend and S2Ram"
-HOMEPAGE="http://suspend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/-utils-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="fbsplash crypt threads"
-
-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"
-
-S="${WORKDIR}/${P/-/-utils-}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-errno.patch \
- "${FILESDIR}"/${P}-bzip2.patch \
- "${FILESDIR}"/${P}-automake-1.13.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="/usr/share/doc/${PF}" \
- --enable-compress \
- $(use_enable crypt encrypt) \
- $(use_enable fbsplash) \
- $(use_enable threads)
-}
-
-src_install() {
- dodir etc
- emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
- elog "In order to make this package work with genkernel see:"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=156445"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/suspend/files/, sys-power/suspend/
@ 2024-11-23 18:29 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-11-23 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 42e5f21bc0357e5a11ec584cc3f0a3d2324d62cb
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Nov 19 01:31:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 18:29:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e5f21b
sys-power/suspend: Fix compile on musl and newer libgcrypt
Closes: https://bugs.gentoo.org/939507
Closes: https://bugs.gentoo.org/936933
Closes: https://bugs.gentoo.org/832981
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39367
Signed-off-by: Sam James <sam <AT> gentoo.org>
...d-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch | 18 ++++++++++++++++
...suspend-1.0_p20200924-fix-loff_t-for-musl.patch | 24 ++++++++++++++++++++++
sys-power/suspend/suspend-1.0_p20200924.ebuild | 8 ++++++--
3 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch b/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch
new file mode 100644
index 000000000000..ea77ab450e71
--- /dev/null
+++ b/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 5f3adb5..b7f21eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -211,7 +211,12 @@ fi
+ if test "${enable_encrypt}" = "yes"; then
+ CONFIG_FEATURES="${CONFIG_FEATURES} encrypt"
+ AC_DEFINE([CONFIG_ENCRYPT], [1], [Define if encryption enabled])
+- AM_PATH_LIBGCRYPT([1:1.6.3], [], [AC_MSG_ERROR([Cannot locate >=libgcrypt-1.6.3])])
++ PKG_CONFIG="pkg-config --static"
++ PKG_CHECK_MODULES([LIBGCRYPT],
++ [libgcrypt >= 1.6.3],
++ ,
++ [AC_MSG_ERROR("Cannot locate >=libgcrypt-1.6.3")]
++ )
+ fi
+
+ if test "${enable_splashy}" = "yes"; then
diff --git a/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch b/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch
new file mode 100644
index 000000000000..37a77118f0c7
--- /dev/null
+++ b/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index 5f3adb5..0c544c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,6 +126,7 @@ AC_CHECK_PROGS([M4], [m4])
+ AC_CHECK_PROG(PERL, perl, perl)
+
+ AC_SYS_LARGEFILE
++AC_USE_SYSTEM_EXTENSIONS
+
+ if test "${enable_create_device}" = "yes"; then
+ AC_CHECK_PROGS([MKNOD], [mknod])
+diff --git a/swsusp.h b/swsusp.h
+index 5f89902..6f4863e 100644
+--- a/swsusp.h
++++ b/swsusp.h
+@@ -9,6 +9,7 @@
+ *
+ */
+
++#include "config.h"
+ #include <stdint.h>
+ #include <linux/fs.h>
+ #include <linux/suspend_ioctls.h>
diff --git a/sys-power/suspend/suspend-1.0_p20200924.ebuild b/sys-power/suspend/suspend-1.0_p20200924.ebuild
index 56be503b7da8..b4d67354418a 100644
--- a/sys-power/suspend/suspend-1.0_p20200924.ebuild
+++ b/sys-power/suspend/suspend-1.0_p20200924.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,7 +32,11 @@ BDEPEND="
S="${WORKDIR}/${PN}"
-PATCHES=( "${WORKDIR}/${P}.patch" )
+PATCHES=(
+ "${WORKDIR}/${P}.patch"
+ "${FILESDIR}/${PN}-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch"
+ "${FILESDIR}/${PN}-1.0_p20200924-fix-loff_t-for-musl.patch"
+ )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-23 18:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-23 18:29 [gentoo-commits] repo/gentoo:master commit in: sys-power/suspend/files/, sys-power/suspend/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-08-18 9:36 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox