* [gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/, app-admin/mcelog/files/
@ 2017-03-08 2:07 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2017-03-08 2:07 UTC (permalink / raw
To: gentoo-commits
commit: 1c87fc4663268b5dddb1c933cdbd249d0ef4460a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 8 01:58:13 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 02:04:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c87fc46
app-admin/mcelog: Version bump to 148.
Bug: https://bugs.gentoo.org/571002
app-admin/mcelog/Manifest | 1 +
.../files/mcelog-1.0_pre3_p20120918-bashism.patch | 4 +-
app-admin/mcelog/files/mcelog-129-debugflags.patch | 22 +++++++++
app-admin/mcelog/mcelog-148.ebuild | 53 ++++++++++++++++++++++
4 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 0d3a11cd9b5..0ae99df7c4e 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,3 +1,4 @@
DIST mcelog-100.tar.gz 288423 SHA256 b18f029ec9f498b6249b3a3dfef7753ac9d45ebf3382af452cb3e14d49274bab SHA512 efd7864daaafe5d149fc27259d4fa72221372842d41ad57c046c967fd1eb710ef921f45111e95bfe76df119276b3b9af1bf1094a9411037eb1f5ac06e319e87d WHIRLPOOL 9f2f7fdbb3c94b7740f486005641a90529e240c34f3709989e6e0d448c96369f4562408aa678ea992f47f396cdfb60c71eadf75475c52ff0cd6318a99c4ad2eb
DIST mcelog-117.tar.gz 296068 SHA256 0e0422e8693e4592a85ed344738004dcedcd930234ab862b0bdcb6ae7aa44f2b SHA512 664e4d9224ec1878153561bebdf4f6c58ea44cf0d494a04eb38cdd73cc8158fabdb0b4823f2303e39818f104298208206dfb9ff64ef13654dadfb5e7a4f5e723 WHIRLPOOL 1919bb2069f216d6a649c883bb9a9417edc9b51d639a73a81f5d5a8d06d874447dc839401858b1d402bbed588077dab93273d012768cb5d1b3fff3ec378d662e
DIST mcelog-122.tar.gz 296366 SHA256 bfdffa82044a4e712ee9570b737169d900bbf53b0a1ea4c9a244b327f8987107 SHA512 895c5263d5632db446edb871d5ec84df75604572c1522f5d457eadaa05edc9a46c761708344a744b460bac5a82f2e52802280c0e6369f34ecd7f50abc6d15c70 WHIRLPOOL e43194b836623fbc268b51494ed3abe9e9cf67e5bd5c1134427f7ae67a30ccb321b971f211b68718a00e85c0c2382b462d59cc598b8c290685708f05b1c631f7
+DIST mcelog-148.tar.gz 296927 SHA256 3de7312ee13b0968ae8e1aa0a77acaaee89a0ed7de45f7ce557939723df3dc04 SHA512 67b793a6446fdba7cbb5b0e9cd6ce7aa6545e6e42395b4731d0431200525960cb8c9c3a10e7e5710836ae9759092235ef817f0ca1cdcc0a441afc402cc0a12bf WHIRLPOOL 638f556dcd4e4ec1b5fd9d8b31522cbbd919ec39b201dfeebf887f55d3f15e0dafd1ebb6fb350f5ecdd21f8e70d5845f36698b39e2d8360ef6f36731f288f10d
diff --git a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
index c6cba7d83ba..335a429ab04 100644
--- a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
+++ b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@gentoo.org>
Date: Sat Jan 26 17:40:22 UTC 2013
Subject: remove bashisms
---- triggers/cache-error-trigger
-+++ triggers/cache-error-trigger
+--- a/triggers/cache-error-trigger
++++ b/triggers/cache-error-trigger
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
diff --git a/app-admin/mcelog/files/mcelog-129-debugflags.patch b/app-admin/mcelog/files/mcelog-129-debugflags.patch
new file mode 100644
index 00000000000..eb46439a62d
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-129-debugflags.patch
@@ -0,0 +1,22 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Oct 24 15:41:33 UTC 2012
+Subject: build system
+
+don't overwrite system CFLAGS, only append "-g -Os" if DEBUG=1 is passed
+as argument
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,11 @@
+-CFLAGS := -g -Os
++CC ?= gcc
++
++# set to 1 to enable debug flags
++DEBUG = 0
++ifeq ($(DEBUG),1)
++CFLAGS += -g -Os
++endif
++
+ prefix := /usr
+ etcprefix :=
+ MANDIR := ${prefix}/share/man
diff --git a/app-admin/mcelog/mcelog-148.ebuild b/app-admin/mcelog/mcelog-148.ebuild
new file mode 100644
index 00000000000..a3753af90a6
--- /dev/null
+++ b/app-admin/mcelog/mcelog-148.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+CONFIG_CHECK="~X86_MCE"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch \
+ "${FILESDIR}"/${PN}-1.0_pre3_p20120918-bashism.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/, app-admin/mcelog/files/
@ 2017-04-07 7:07 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2017-04-07 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 20412c333e054e47eb46e37a62396f06cd97a0d1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 7 07:05:56 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 07:05:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20412c33
app-admin/mcelog: Drop old
app-admin/mcelog/Manifest | 4 --
.../files/mcelog-1.0_pre3_p20120918-bashism.patch | 21 --------
.../files/mcelog-1.0_pre3_p20120918-build.patch | 42 ----------------
app-admin/mcelog/files/mcelog.init | 28 -----------
app-admin/mcelog/mcelog-100.ebuild | 58 ----------------------
app-admin/mcelog/mcelog-117.ebuild | 52 -------------------
app-admin/mcelog/mcelog-122.ebuild | 52 -------------------
app-admin/mcelog/mcelog-148.ebuild | 53 --------------------
8 files changed, 310 deletions(-)
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 59f4fcb900f..37d6392a0eb 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,5 +1 @@
-DIST mcelog-100.tar.gz 288423 SHA256 b18f029ec9f498b6249b3a3dfef7753ac9d45ebf3382af452cb3e14d49274bab SHA512 efd7864daaafe5d149fc27259d4fa72221372842d41ad57c046c967fd1eb710ef921f45111e95bfe76df119276b3b9af1bf1094a9411037eb1f5ac06e319e87d WHIRLPOOL 9f2f7fdbb3c94b7740f486005641a90529e240c34f3709989e6e0d448c96369f4562408aa678ea992f47f396cdfb60c71eadf75475c52ff0cd6318a99c4ad2eb
-DIST mcelog-117.tar.gz 296068 SHA256 0e0422e8693e4592a85ed344738004dcedcd930234ab862b0bdcb6ae7aa44f2b SHA512 664e4d9224ec1878153561bebdf4f6c58ea44cf0d494a04eb38cdd73cc8158fabdb0b4823f2303e39818f104298208206dfb9ff64ef13654dadfb5e7a4f5e723 WHIRLPOOL 1919bb2069f216d6a649c883bb9a9417edc9b51d639a73a81f5d5a8d06d874447dc839401858b1d402bbed588077dab93273d012768cb5d1b3fff3ec378d662e
-DIST mcelog-122.tar.gz 296366 SHA256 bfdffa82044a4e712ee9570b737169d900bbf53b0a1ea4c9a244b327f8987107 SHA512 895c5263d5632db446edb871d5ec84df75604572c1522f5d457eadaa05edc9a46c761708344a744b460bac5a82f2e52802280c0e6369f34ecd7f50abc6d15c70 WHIRLPOOL e43194b836623fbc268b51494ed3abe9e9cf67e5bd5c1134427f7ae67a30ccb321b971f211b68718a00e85c0c2382b462d59cc598b8c290685708f05b1c631f7
-DIST mcelog-148.tar.gz 296927 SHA256 3de7312ee13b0968ae8e1aa0a77acaaee89a0ed7de45f7ce557939723df3dc04 SHA512 67b793a6446fdba7cbb5b0e9cd6ce7aa6545e6e42395b4731d0431200525960cb8c9c3a10e7e5710836ae9759092235ef817f0ca1cdcc0a441afc402cc0a12bf WHIRLPOOL 638f556dcd4e4ec1b5fd9d8b31522cbbd919ec39b201dfeebf887f55d3f15e0dafd1ebb6fb350f5ecdd21f8e70d5845f36698b39e2d8360ef6f36731f288f10d
DIST mcelog-149.tar.gz 296943 SHA256 a9313ed45cabaf7ef0a4d986ecf24a3c9ced9a4b1e34032d380af4e70c73512f SHA512 d2cb7cb26d4407dd03a425568a19c96e5f53cc9447c58cd105d74a2f69b645ef6b444c9533186aac6b052f0721959a321a3f8061477d1451a62be36add097aeb WHIRLPOOL ddea0a8efca6e5180d4d3ce663a0366b1a2eb78d8d11690e21aea81d3956838013aec7e83f29f6a745a63d18e95e8c71a2b00be135a5982013462b3911aa7f57
diff --git a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
deleted file mode 100644
index 335a429ab04..00000000000
--- a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jan 26 17:40:22 UTC 2013
-Subject: remove bashisms
-
---- a/triggers/cache-error-trigger
-+++ b/triggers/cache-error-trigger
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # cache error trigger. This shell script is executed by mcelog in daemon mode
- # when a CPU reports excessive corrected cache errors. This could be a indication
- # for future uncorrected errors.
-@@ -28,7 +28,7 @@
- logger -s -p daemon.crit -t mcelog "Offlining CPU $i due to cache error threshold"
- F=$(printf "/sys/devices/system/cpu/cpu%d/online" $i)
- echo 0 > $F
-- if [ "$(< $F)" != "0" ] ; then
-+ if [ "$(cat $F)" != "0" ] ; then
- logger -s -p daemon.warn -t mcelog "Offlining CPU $i failed"
- EXIT=1
- fi
diff --git a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch b/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch
deleted file mode 100644
index 6444bfb133e..00000000000
--- a/app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Oct 24 15:41:33 UTC 2012
-Subject: build system
-
-don't overwrite system CFLAGS, only append "-g -Os" if DEBUG=1 is passed
-as argument
-
-always use $(CC) instead of "gcc"
-
---- Makefile
-+++ Makefile
-@@ -1,4 +1,11 @@
--CFLAGS := -g -Os
-+CC ?= gcc
-+
-+# set to 1 to enable debug flags
-+DEBUG = 0
-+ifeq ($(DEBUG),1)
-+CFLAGS += -g -Os
-+endif
-+
- prefix := /usr
- etcprefix :=
- # Define appropiately for your distribution
-@@ -70,7 +77,7 @@
- rm -f ${CLEAN} ${OBJ}
-
- tsc: tsc.c
-- gcc -o tsc ${CFLAGS} -DSTANDALONE tsc.c ${LDFLAGS}
-+ $(CC) -o tsc ${CFLAGS} -DSTANDALONE tsc.c ${LDFLAGS}
-
- dbquery: db.o dbquery.o memutil.o
-
-@@ -101,7 +108,7 @@
- echo $(SRC)
-
- config-test: config.c
-- gcc -DTEST=1 config.c -o config-test
-+ $(CC) -DTEST=1 config.c -o config-test
-
- test:
- $(MAKE) -C tests test DEBUG=""
diff --git a/app-admin/mcelog/files/mcelog.init b/app-admin/mcelog/files/mcelog.init
deleted file mode 100644
index 6c1b8016749..00000000000
--- a/app-admin/mcelog/files/mcelog.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description='Start/stop mcelog in daemon mode'
-
-PIDFILE="/var/run/mcelog.pid"
-
-depend() {
- after udev
- need localmount
- use logging
-}
-
-start() {
- ebegin "Starting mcelog"
- start-stop-daemon \
- --start \
- --pidfile ${PIDFILE} \
- --exec /usr/sbin/mcelog -- --daemon --pidfile ${PIDFILE} ${MCELOG_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping mcelog"
- start-stop-daemon --stop --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/app-admin/mcelog/mcelog-100.ebuild b/app-admin/mcelog/mcelog-100.ebuild
deleted file mode 100644
index 8072b9a2b6f..00000000000
--- a/app-admin/mcelog/mcelog-100.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info eutils systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-CONFIG_CHECK="~X86_MCE"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-1.0_pre3_p20120918-build.patch \
- "${FILESDIR}"/${PN}-1.0_pre3_p20120918-bashism.patch
- tc-export CC
-}
-
-src_install() {
- dosbin ${PN}
-
- insinto /etc/cron.daily
- newins ${PN}.cron ${PN}
-
- insinto /etc/logrotate.d/
- newins ${PN}.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}.init ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- insinto /etc/${PN}
- doins mcelog.conf
- exeinto /etc/${PN}
- doexe triggers/*
-
- dodoc CHANGES README TODO *.pdf
- doman ${PN}.8
-}
-
-pkg_postinst() {
- einfo "The default configuration set is now installed in /etc/${PN}"
- einfo "you might want to edit those files."
- einfo
- einfo "A sample cronjob is installed into /etc/cron.daily"
- einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-117.ebuild b/app-admin/mcelog/mcelog-117.ebuild
deleted file mode 100644
index 6d3cfe9c2c5..00000000000
--- a/app-admin/mcelog/mcelog-117.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info eutils systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-CONFIG_CHECK="~X86_MCE"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-1.0_pre3_p20120918-build.patch \
- "${FILESDIR}"/${PN}-1.0_pre3_p20120918-bashism.patch
- tc-export CC
-}
-
-src_install() {
- default
-
- insinto /etc/cron.daily
- newins ${PN}.cron ${PN}
-
- insinto /etc/logrotate.d/
- newins ${PN}.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- dodoc *.pdf
-}
-
-pkg_postinst() {
- einfo "The default configuration set is now installed in /etc/${PN}"
- einfo "you might want to edit those files."
- einfo
- einfo "A sample cronjob is installed into /etc/cron.daily"
- einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-122.ebuild b/app-admin/mcelog/mcelog-122.ebuild
deleted file mode 100644
index 6d3cfe9c2c5..00000000000
--- a/app-admin/mcelog/mcelog-122.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info eutils systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-CONFIG_CHECK="~X86_MCE"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-1.0_pre3_p20120918-build.patch \
- "${FILESDIR}"/${PN}-1.0_pre3_p20120918-bashism.patch
- tc-export CC
-}
-
-src_install() {
- default
-
- insinto /etc/cron.daily
- newins ${PN}.cron ${PN}
-
- insinto /etc/logrotate.d/
- newins ${PN}.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- dodoc *.pdf
-}
-
-pkg_postinst() {
- einfo "The default configuration set is now installed in /etc/${PN}"
- einfo "you might want to edit those files."
- einfo
- einfo "A sample cronjob is installed into /etc/cron.daily"
- einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-148.ebuild b/app-admin/mcelog/mcelog-148.ebuild
deleted file mode 100644
index a3753af90a6..00000000000
--- a/app-admin/mcelog/mcelog-148.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-CONFIG_CHECK="~X86_MCE"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-129-debugflags.patch \
- "${FILESDIR}"/${PN}-1.0_pre3_p20120918-bashism.patch
- eapply_user
- tc-export CC
-}
-
-src_install() {
- default
-
- insinto /etc/cron.daily
- newins ${PN}.cron ${PN}
-
- insinto /etc/logrotate.d/
- newins ${PN}.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- dodoc *.pdf
-}
-
-pkg_postinst() {
- einfo "The default configuration set is now installed in /etc/${PN}"
- einfo "you might want to edit those files."
- einfo
- einfo "A sample cronjob is installed into /etc/cron.daily"
- einfo "without executable bit (system service is the preferred method now)"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/, app-admin/mcelog/files/
@ 2020-12-28 19:03 Ben Kohler
0 siblings, 0 replies; 5+ messages in thread
From: Ben Kohler @ 2020-12-28 19:03 UTC (permalink / raw
To: gentoo-commits
commit: 761856488fbf78bd1b4c237ccba2b645060ca7c5
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 18:54:04 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 18:54:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76185648
app-admin/mcelog: drop old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
app-admin/mcelog/files/mcelog.service | 10 ------
app-admin/mcelog/mcelog-173.ebuild | 58 -----------------------------------
2 files changed, 68 deletions(-)
diff --git a/app-admin/mcelog/files/mcelog.service b/app-admin/mcelog/files/mcelog.service
deleted file mode 100644
index 4bd553012c9..00000000000
--- a/app-admin/mcelog/files/mcelog.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Machine Check Exception Logging Daemon
-After=syslog.target
-
-[Service]
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/mcelog/mcelog-173.ebuild b/app-admin/mcelog/mcelog-173.ebuild
deleted file mode 100644
index c298cf56224..00000000000
--- a/app-admin/mcelog/mcelog-173.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != buildonly ]]; then
- local CONFIG_CHECK="~X86_MCE"
- kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
- check_extra_config
- fi
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-129-debugflags.patch
- eapply_user
- tc-export CC
-}
-
-src_install() {
- default
-
- insinto /etc/cron.daily
- newins ${PN}.cron ${PN}
-
- insinto /etc/logrotate.d/
- newins ${PN}.logrotate ${PN}
-
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- dodoc *.pdf
-}
-
-pkg_postinst() {
- einfo "The default configuration set is now installed in /etc/${PN}"
- einfo "you might want to edit those files."
- einfo
- einfo "A sample cronjob is installed into /etc/cron.daily"
- einfo "without executable bit (system service is the preferred method now)"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/, app-admin/mcelog/files/
@ 2021-11-12 5:05 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-11-12 5:05 UTC (permalink / raw
To: gentoo-commits
commit: 6feb18a9349da1ced86faf2e759f6797f74510ff
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 12 05:05:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 05:05:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6feb18a9
app-admin/mcelog: fix logrotate file syntax
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mcelog/files/mcelog-179-fix-logrotate.patch | 21 +++++++++++++++++++++
.../{mcelog-179.ebuild => mcelog-179-r1.ebuild} | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch b/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
new file mode 100644
index 00000000000..66978d02247
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-179-fix-logrotate.patch
@@ -0,0 +1,21 @@
+Should be in the next release:
+https://github.com/andikleen/mcelog/commit/2261c74a88f9bc9e87c9ffaae5a98261087730ae.patch
+
+From: Andi Kleen <andi@firstfloor.org>
+Date: Sat, 6 Nov 2021 07:22:24 -0700
+Subject: [PATCH] Fix logrotate syntax
+
+Fixes #102
+
+Signed-off-by: Andi Kleen <andi@firstfloor.org>
+--- a/mcelog.logrotate
++++ b/mcelog.logrotate
+@@ -3,7 +3,7 @@
+ dateext
+ maxage 365
+ rotate 99
+- size=+2048k
++ size +2048k
+ notifempty
+ missingok
+ copytruncate
diff --git a/app-admin/mcelog/mcelog-179.ebuild b/app-admin/mcelog/mcelog-179-r1.ebuild
similarity index 91%
rename from app-admin/mcelog/mcelog-179.ebuild
rename to app-admin/mcelog/mcelog-179-r1.ebuild
index c8833103e6e..147b65e40b9 100644
--- a/app-admin/mcelog/mcelog-179.ebuild
+++ b/app-admin/mcelog/mcelog-179-r1.ebuild
@@ -29,7 +29,8 @@ pkg_pretend() {
src_prepare() {
eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
- "${FILESDIR}"/${PN}-129-debugflags.patch
+ "${FILESDIR}"/${PN}-129-debugflags.patch \
+ "${FILESDIR}"/${PN}-179-fix-logrotate.patch
eapply_user
tc-export CC
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/, app-admin/mcelog/files/
@ 2023-06-14 14:10 Ben Kohler
0 siblings, 0 replies; 5+ messages in thread
From: Ben Kohler @ 2023-06-14 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 5d2a2b302b1f169bd6c0337ab8b5365300edfd46
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jun 12 11:24:17 2023 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 14:10:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2a2b30
app-admin/mcelog: Fix call to undeclared library function strncpy on musl
Closes: https://bugs.gentoo.org/894316
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31397
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
app-admin/mcelog/files/mcelog-194-musl-fix.patch | 21 +++++++++
app-admin/mcelog/mcelog-194-r1.ebuild | 55 ++++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/app-admin/mcelog/files/mcelog-194-musl-fix.patch b/app-admin/mcelog/files/mcelog-194-musl-fix.patch
new file mode 100644
index 000000000000..6ea3c1f79303
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-194-musl-fix.patch
@@ -0,0 +1,21 @@
+https://github.com/andikleen/mcelog/pull/115
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Mon, 12 Jun 2023 10:56:44 +0000
+Subject: [PATCH] client: Fix build w/ musl libc
+
+Refer: https://github.com/andikleen/mcelog/pull/115
+Bug: https://bugs.gentoo.org/894316
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/client.c
++++ b/client.c
+@@ -19,6 +19,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
++#include <string.h>
+ #include "mcelog.h"
+ #include "client.h"
+ #include "paths.h"
+--
+2.41.0
+
diff --git a/app-admin/mcelog/mcelog-194-r1.ebuild b/app-admin/mcelog/mcelog-194-r1.ebuild
new file mode 100644
index 000000000000..07ee8eae7fe6
--- /dev/null
+++ b/app-admin/mcelog/mcelog-194-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-194-musl-fix.patch
+ "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ default
+ tc-export CC
+ python_fix_shebang genconfig.py
+}
+
+src_install() {
+ default
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit ${PN}.service
+
+ dodoc *.pdf
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-14 14:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-28 19:03 [gentoo-commits] repo/gentoo:master commit in: app-admin/mcelog/, app-admin/mcelog/files/ Ben Kohler
-- strict thread matches above, loose matches on Subject: below --
2023-06-14 14:10 Ben Kohler
2021-11-12 5:05 Sam James
2017-04-07 7:07 Matt Turner
2017-03-08 2:07 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox