gentoo auto-resync : 24:09:2023 - 05:21:45

4 files changed, 192 insertions, 33 deletions

diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 1701e5766fcc..8bde44b4cca2 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -10,5 +10,6 @@ AUX ipmitool-1.8.19-nvidia-iana.patch 1243 BLAKE2B 9e97ece902caa6f222fd23d5f1be7
 AUX log_bmc.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920fc6cefe6770231d67989d47f172e783416d12feb399e882e2fe74b26fdef162fafb85cd686ec83d414d01 SHA512 2d5b62ee5f694629e8f5c4c2d1fcdf7a3d42078f488e43cd1b34193619918ea7429da2bcb236b9216cfabaf94d8c5224b99194023a8db626884c4c766f15136a
 DIST enterprise-numbers-1.8.19.xz 1500100 BLAKE2B 15c21792bf46220c5908ecf4f0ddafe2fdf13a1799c054a0cb0cb647e7f489768855c4c25fba8a4408505ff0cf02d1a43408d5c4de557b1b30fe8abb477a7926 SHA512 e88cb459a9c8a3172770bcfefbec0a7ad7d65395063c8c0173fce776ea0beb7ad9f3610e636dfbd71d0af8c952c2b9bc6c25c815daa4ab281bed983cbe2ebcc4
 DIST ipmitool-1.8.19.tar.gz 641383 BLAKE2B e1db12bb7301cb4b551f87fbfcd405b3597a1f32c45447b2b239d9d43a2cdbe213ee5408291d50801035cc80e28078fb3a778ab28335665bc3316798c13ea1fc SHA512 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3
-EBUILD ipmitool-1.8.19.ebuild 4154 BLAKE2B 28ed926f091b2a0729aa21613ec843fde0f545c206315feab67de7c6cc806a7b630dc43fb9e173163e1259dd7318471271b530e245203afcb408eedebaba0273 SHA512 7b0e10c584def8b8496f6dc374718b8ce53b09e43c2e3aec4110310dd56634874551ff1bf4af82055251c702d8410b5b84e25fc61c3a0a86a9adb869cf57e865
-MISC metadata.xml 693 BLAKE2B 7a0cab3772eb4ebc0529b22ab7fa21eae882da4b652fe67c3abfc8e25b1f5a6d14a52089ec676a17a0a925436675ec80409cde8d2554c4f6dce50c4afc736b14 SHA512 8a2ace6c302db4437e6903899edf87aa005f47c5e84969e4d846f67e97a027bda05fced0ca2b1a8a09f12ed5be3ce9bdabfc1b75643c2a9435ba706a452eb055
+EBUILD ipmitool-1.8.19-r1.ebuild 4222 BLAKE2B 6d4cf04e4d14de793c0e3f45e0d9c3a62ba77469861adc699817634269ca62dbef3534bbf1151bce105d30bdce36eb37eb9d448ccae12d807aff28e3424e706b SHA512 9b1a6f916fb5d21fada8fb5108eed9480513beb783349c3a5a7af1d67be768ff5808867f001d4d42d51d45cad93d6d2e3f07a095d028958ad9b770928d9fa526
+EBUILD ipmitool-1.8.19.ebuild 4140 BLAKE2B 0cb661e658ee58de67521734b2ecd7dff3bbd116ea4f6ec8e8146c15cde65917393eced7f7810bfb0f669d3b43647b4dbddb6f0587f19166225ddf800451942c SHA512 a1075af789dd559416d480603c34456b4ab12318eef99921768bcba22028b932007db11d2ff95402a8c608e4514026686d3d29e6fb3f17cbb961d6593594dfe5
+MISC metadata.xml 642 BLAKE2B 577ef5707198e8d5d3bb022a8287a825c4e4f3ed1e3941316622604ea3aa3fd5e53d5c7874ed682dc98617ec96cb963be0cbb785e8438429be3cb17089a66494 SHA512 8b47c396b98021e12a91ca328637770a1a3dffd050d9daa689dd1ce9867e668c52f8e2347fba086aa045dfa80c8cb755d40126a41d5f2d340fb954d9eb73a629
diff --git a/sys-apps/ipmitool/ipmitool-1.8.19-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.19-r1.ebuild
new file mode 100644
index 000000000000..6c2e4e526b97
--- /dev/null
+++ b/sys-apps/ipmitool/ipmitool-1.8.19-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Utility for controlling IPMI enabled devices"
+HOMEPAGE="https://codeberg.org/IPMITool/ipmitool"
+
+COMMIT_ID=
+if [[ -n "${COMMIT_ID}" ]]; then
+	SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	MY_P="${PN^^}_${PV//./_}"
+	SRC_URI="https://github.com/ipmitool/ipmitool/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_P}"
+fi
+
+# to generate: `make enterprise-numbers` from git checkout of release tag
+SRC_URI+="
+	https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/enterprise-numbers-${PV}.xz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="openbmc openipmi static"
+
+RDEPEND="
+	dev-libs/openssl:=
+	sys-libs/readline:=
+	openbmc? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/os-headers
+	openipmi? ( sys-libs/openipmi )
+"
+#freeipmi? ( sys-libs/freeipmi )
+# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
+# but it doesn't actually need either.
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing-func-decl.patch"
+	# yoinked out of debian's patchset, previously carried in a SRC_URI
+	# tarball
+	"${FILESDIR}/${P}-fix-buffer-overflow.patch"
+	"${FILESDIR}/${P}-CVE-2011-4339.patch"
+	"${FILESDIR}/${P}-manpage-longlines.patch"
+	"${FILESDIR}/${P}-nvidia-iana.patch"
+)
+
+src_prepare() {
+	default
+
+	# Gentoo chooses to install ipmitool in /usr/sbin
+	# Where RedHat chooses /usr/bin
+	sed -i -e \
+		's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \
+		"${S}"/contrib/* \
+		|| die "sed bindir failed"
+
+	eautoreconf
+
+	# If this file is not present, then ipmitool will try to download it during make install!
+	cp -al "${WORKDIR}/enterprise-numbers-${PV}" "${S}/enterprise-numbers" \
+		|| die "Could not place IANA enterprise-numbers"
+}
+
+src_configure() {
+	# bug #863587
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	# - LIPMI and BMC are the Solaris libs
+	# - OpenIPMI is unconditionally enabled in the configure as there is compat
+	# code that is used if the library itself is not available
+	# - FreeIPMI does build now, but is disabled until the other arches keyword it
+	#	`use_enable freeipmi intf-free` \
+	# - --enable-ipmievd is now unconditional
+	local econfargs=(
+		$(use_enable static)
+		--enable-ipmishell
+		--enable-intf-lan
+		--enable-intf-usb
+		$(use_enable openbmc intf-dbus)
+		--enable-intf-lanplus
+		--enable-intf-open
+		--enable-intf-serial
+		--disable-intf-bmc
+		--disable-intf-dummy
+		--disable-intf-free
+		--disable-intf-imb
+		--disable-intf-lipmi
+		--disable-internal-md5
+		--with-kerneldir=/usr
+		--bindir=/usr/sbin
+		--runstatedir=/run
+		CFLAGS="${CFLAGS}"
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PACKAGE="${PF}" install
+	into /usr
+
+	newinitd "${FILESDIR}/ipmievd.initd" ipmievd
+	newconfd "${FILESDIR}/ipmievd.confd" ipmievd
+
+	# From debian, less configurable than OpenRC
+	systemd_dounit "${FILESDIR}/ipmievd.service"
+
+	dosbin contrib/bmclanconf
+
+	exeinto /usr/libexec
+	doexe contrib/log_bmc.sh
+	newinitd "${FILESDIR}/log_bmc.initd" log_bmc
+
+	# contrib/exchange-bmc-os-info.init.redhat
+	# contrib/exchange-bmc-os-info.service.redhat
+	# contrib/exchange-bmc-os-info.sysconf
+	exeinto /usr/libexec
+	newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info
+
+	insinto /etc/sysconfig
+	newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info
+
+	systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service
+	newinitd "${FILESDIR}/exchange-bmc-os-info.initd" exchange-bmc-os-info
+
+	# contrib/bmc-snmp-proxy
+	# contrib/bmc-snmp-proxy.service
+	# contrib/bmc-snmp-proxy.sysconf
+	exeinto /usr/libexec
+	doexe contrib/bmc-snmp-proxy
+
+	insinto /etc/sysconfig
+	newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy
+
+	systemd_dounit contrib/bmc-snmp-proxy.service
+	# TODO: initd for bmc-snmp-proxy
+
+	insinto "/usr/share/${PN}"
+	doins contrib/oem_ibm_sel_map
+
+	cd "${S}/contrib"
+
+	docinto contrib
+	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
+}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.19.ebuild b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
index 6e5a899d9aa5..6e5efa1a400d 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
@@ -6,35 +6,40 @@ EAPI=8
 inherit autotools systemd
 
 DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="https://github.com/ipmitool/ipmitool"
+HOMEPAGE="https://codeberg.org/IPMITool/ipmitool"
 
 COMMIT_ID=
 if [[ -n "${COMMIT_ID}" ]]; then
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT_ID}"
 else
 	MY_P="${PN^^}_${PV//./_}"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ipmitool/ipmitool/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_P}"
 fi
 
 # to generate: `make enterprise-numbers` from git checkout of release tag
 SRC_URI+="
-	https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/enterprise-numbers-${PV}.xz"
+	https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/enterprise-numbers-${PV}.xz
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="openbmc openipmi static"
 
-RDEPEND="dev-libs/openssl:0=
-	sys-libs/readline:0=
-	openbmc? ( sys-apps/systemd:0= )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-libs/openssl:=
+	sys-libs/readline:=
+	openbmc? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
 	>=sys-devel/autoconf-2.69-r5
 	virtual/os-headers
-	openipmi? ( sys-libs/openipmi )"
-	#freeipmi? ( sys-libs/freeipmi )
+	openipmi? ( sys-libs/openipmi )
+"
+#freeipmi? ( sys-libs/freeipmi )
 # ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
 # but it doesn't actually need either.
 
@@ -69,28 +74,27 @@ src_configure() {
 	# - LIPMI and BMC are the Solaris libs
 	# - OpenIPMI is unconditionally enabled in the configure as there is compat
 	# code that is used if the library itself is not available
-	# FreeIPMI does build now, but is disabled until the other arches keyword it
+	# - FreeIPMI does build now, but is disabled until the other arches keyword it
 	#	`use_enable freeipmi intf-free` \
-	# --enable-ipmievd is now unconditional
-
+	# - --enable-ipmievd is now unconditional
 	local econfargs=(
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--enable-intf-usb \
-		$(use_enable openbmc intf-dbus) \
-		--enable-intf-lanplus \
-		--enable-intf-open \
-		--enable-intf-serial \
-		--disable-intf-bmc \
-		--disable-intf-dummy \
-		--disable-intf-free \
-		--disable-intf-imb \
-		--disable-intf-lipmi \
-		--disable-internal-md5 \
-		--with-kerneldir=/usr \
-		--bindir=/usr/sbin \
-		--runstatedir=/run \
+		$(use_enable static)
+		--enable-ipmishell
+		--enable-intf-lan
+		--enable-intf-usb
+		$(use_enable openbmc intf-dbus)
+		--enable-intf-lanplus
+		--enable-intf-open
+		--enable-intf-serial
+		--disable-intf-bmc
+		--disable-intf-dummy
+		--disable-intf-free
+		--disable-intf-imb
+		--disable-intf-lipmi
+		--disable-internal-md5
+		--with-kerneldir=/usr
+		--bindir=/usr/sbin
+		--runstatedir=/run
 		CFLAGS="${CFLAGS}"
 	)
 
diff --git a/sys-apps/ipmitool/metadata.xml b/sys-apps/ipmitool/metadata.xml
index 5a7c948d8055..4fca0ad7d1e7 100644
--- a/sys-apps/ipmitool/metadata.xml
+++ b/sys-apps/ipmitool/metadata.xml
@@ -12,7 +12,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">ipmitool</remote-id>
-    <remote-id type="launchpad">ubuntu</remote-id>
     <remote-id type="github">ipmitool/ipmitool</remote-id>
   </upstream>
 </pkgmetadata>