From 4ef68f728e93ccb195b37da0be68cd92888b0012 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 19 Mar 2022 19:19:43 +0100 Subject: sys-block/scsirastools: drop 1.5.7-r1, 1.6.4-r1 Closes: https://bugs.gentoo.org/835359 Signed-off-by: David Seifert --- sys-block/scsirastools/Manifest | 2 - .../files/scsirastools-1.5.6-glibc-2.10.patch | 87 ---------------------- .../files/scsirastools-1.5.7-sysmacros.patch | 23 ------ .../scsirastools/scsirastools-1.5.7-r1.ebuild | 58 --------------- .../scsirastools/scsirastools-1.6.4-r1.ebuild | 53 ------------- 5 files changed, 223 deletions(-) delete mode 100644 sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch delete mode 100644 sys-block/scsirastools/files/scsirastools-1.5.7-sysmacros.patch delete mode 100644 sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild delete mode 100644 sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild diff --git a/sys-block/scsirastools/Manifest b/sys-block/scsirastools/Manifest index 3b578032c07a..f6bb68fec95a 100644 --- a/sys-block/scsirastools/Manifest +++ b/sys-block/scsirastools/Manifest @@ -1,3 +1 @@ -DIST scsirastools-1.5.7.tar.gz 677348 BLAKE2B f94134fc9e4c17d794a77e42143d620fb8096e2cc64e66fa290563921fa625a322f823ba9f88c17547eb5f03e0a6caf14e106e9d0499afd301e6961fead0345c SHA512 399d366216b5f24ef67086b2e5713a259435293219e22166530a6b92a45519b677bd980906691d2166f1fa6b6ee873568b143df32cfed6a5500066ea914b12f2 -DIST scsirastools-1.6.4.tar.gz 659203 BLAKE2B d041d64662d13165baa1f182e765334ff9027325c90ae92557a48d1edbcba8e96376f0bd5fa1a9952557c74f1c0acad52aff415207c114df44459f1ad99f9da2 SHA512 a0331557eb9c535b3bf33a95994d957505873bc1b39ee240846161a79d7e1f7ed494b23678e23931e917014cf7ebb6a0dd81e5f62089db06e03cf138db06a0fa DIST scsirastools-1.6.6.tar.gz 813890 BLAKE2B 62ccbc2462e9d4d3ce3aba2a0c0c70b8634e41b8230415b0137674079fc2e73ea5006215ef7aa66f912170f1c485c5a03c3e365f280e8e173562f29a7952f56a SHA512 a679e41e0984e3aa21be57129329bd40a08a436c256645b4f8b00250f3f8f0c9d3cf15540f5f75a21d1b7b3826a0fc2830ad5f3ade54a6e703fc8ffbcc01d886 diff --git a/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch b/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch deleted file mode 100644 index de874bad2911..000000000000 --- a/sys-block/scsirastools/files/scsirastools-1.5.6-glibc-2.10.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -ur scsirastools-1.5.6.orig/src/getmd.c scsirastools-1.5.6/src/getmd.c ---- scsirastools-1.5.6.orig/src/getmd.c 2007-02-02 21:16:38.000000000 +0200 -+++ scsirastools-1.5.6/src/getmd.c 2009-08-05 22:51:00.000000000 +0300 -@@ -81,7 +81,7 @@ - } else return (-1); /*not found*/ - } - --static int getline(FILE * fd, char *buf, int len) -+static int get_line(FILE * fd, char *buf, int len) - { - int i; - int ch; -@@ -119,7 +119,7 @@ - sraidstr = strlen(raidstr); - strcpy(mdpart, "/dev/sda1"); /* default */ - strcpy(rdev, "/dev/md0"); /* default */ -- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ -+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ - buf[rlen] = 0; /* stringify */ - /* look for raiddev string */ - i = findmatch(buf, rlen, raidstr, sraidstr, 0); -diff -ur scsirastools-1.5.6.orig/src/sgraidmon.c scsirastools-1.5.6/src/sgraidmon.c ---- scsirastools-1.5.6.orig/src/sgraidmon.c 2007-10-16 01:15:15.000000000 +0300 -+++ scsirastools-1.5.6/src/sgraidmon.c 2009-08-05 22:51:00.000000000 +0300 -@@ -330,7 +330,7 @@ - rdev[0] = 0; /* default rdev (mddev) */ - strcpy(mdpart, "/dev/sdz1"); /* default mdpart */ - foundit = 0; -- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ -+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ - buf[rlen] = 0; /* stringify */ - /* check for comment */ - if (buf[0] == '#') continue; -@@ -392,7 +392,7 @@ - if (fd == NULL) return (np); - sraidstr = strlen(raidstr); - sdevstr = strlen(devstr); -- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ -+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ - buf[rlen] = 0; /* stringify */ - /* check for comment */ - if (buf[0] == '#') continue; -diff -ur scsirastools-1.5.6.orig/src/sgsafte.c scsirastools-1.5.6/src/sgsafte.c ---- scsirastools-1.5.6.orig/src/sgsafte.c 2007-09-13 00:45:29.000000000 +0300 -+++ scsirastools-1.5.6/src/sgsafte.c 2009-08-05 22:51:00.000000000 +0300 -@@ -231,7 +231,7 @@ - rdev[0] = 0; /* default rdev (mddev) */ - strcpy(mdpart, "/dev/sdz1"); /* default mdpart */ - foundit = 0; -- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ -+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ - buf[rlen] = 0; /* stringify */ - /* look for raiddev string */ - i = findmatch(buf, rlen, raidstr, sraidstr, 0); -@@ -284,7 +284,7 @@ - fd = fopen(raidfile, "r"); - if (fd == NULL) return (np); - sraidstr = strlen(raidstr); -- while ((rlen = getline(fd, buf, 80)) > 0) { /* process each line */ -+ while ((rlen = get_line(fd, buf, 80)) > 0) { /* process each line */ - buf[rlen] = 0; /* stringify */ - /* look for raiddev string */ - i = findmatch(buf, rlen, raidstr, sraidstr, 0); -diff -ur scsirastools-1.5.6.orig/src/sgsubmon.c scsirastools-1.5.6/src/sgsubmon.c ---- scsirastools-1.5.6.orig/src/sgsubmon.c 2007-10-16 17:03:39.000000000 +0300 -+++ scsirastools-1.5.6/src/sgsubmon.c 2009-08-05 22:51:00.000000000 +0300 -@@ -159,7 +159,7 @@ - return; - } - --int getline(FILE * fd, char *buf, int len) -+int get_line(FILE * fd, char *buf, int len) - { - int i; - int ch; -diff -ur scsirastools-1.5.6.orig/src/sgsubmon.h scsirastools-1.5.6/src/sgsubmon.h ---- scsirastools-1.5.6.orig/src/sgsubmon.h 2007-09-13 00:38:28.000000000 +0300 -+++ scsirastools-1.5.6/src/sgsubmon.h 2009-08-05 22:50:59.000000000 +0300 -@@ -124,7 +124,7 @@ - void itoh(uchar * chp, int len, char *str); - void dumpbufr(FILE * fdout, uchar * bufp, int mlen, char *hdr); - void dump_buf(FILE * fdout, uchar * bufp, int mlen, char *hdr, char fascii); --int getline(FILE * fd, char *buf, int len) ; -+int get_line(FILE * fd, char *buf, int len) ; - int findmatch(char *buffer,int sbuf, char *pattern,int spattern,char figncase); - int fillstr(char *to, uchar *from,int len); - int IsSATA(int idev); diff --git a/sys-block/scsirastools/files/scsirastools-1.5.7-sysmacros.patch b/sys-block/scsirastools/files/scsirastools-1.5.7-sysmacros.patch deleted file mode 100644 index 76cef536de8f..000000000000 --- a/sys-block/scsirastools/files/scsirastools-1.5.7-sysmacros.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/580214 -https://sourceforge.net/p/scsirastools/bugs/16/ - ---- a/src/sgcommon.c -+++ b/src/sgcommon.c -@@ -62,6 +62,7 @@ - -------------------------------------------------------------------------*/ - #include - #include -+#include - #include - #include - #include ---- a/src/sgsubmon.c -+++ b/src/sgsubmon.c -@@ -34,6 +34,7 @@ - *---------------------------------------------------------------------------*/ - #include - #include -+#include - #include - #include - #include diff --git a/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild b/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild deleted file mode 100644 index 6fab3675a2ee..000000000000 --- a/sys-block/scsirastools/scsirastools-1.5.7-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools epatch - -DESCRIPTION="Serviceability for SCSI Disks and Arrays" -HOMEPAGE="http://scsirastools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=">=sys-apps/sg3_utils-1.44" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-sysmacros.patch #580214 - # this builds a really old mdadm - sed -i \ - -e '/RPMB/d' \ - -e '/^SUBDIRS/s,mdadm.d,,' \ - -e '/^SUBDIRS/s,files,,' \ - Makefile.am || die "sed Makefile.am failed" - epatch "${FILESDIR}"/${PN}-1.5.6-glibc-2.10.patch - eautoreconf - # i386 ELF binaries in tarball = bad - rm -f "${S}"/files/alarms* - - # Fix up /sbin instances to be /usr/sbin instead - for i in src/sgraidmon.c src/sgdiskmon.c ; do - sed -i "${S}"/${i} \ - -e '/evtcmd\[\].*\"\/sbin\//s,/sbin/,/usr/sbin/,' \ - || die "Failed to set /sbin in sources" - done -} - -src_configure() { - econf --sbindir=/usr/sbin -} - -src_install() { - into /usr - docdir="/usr/share/doc/${PF}/" - emake install DESTDIR="${D}" datato="${D}${docdir}" - dosbin files/sgevt - dosbin files/mdevt - # unneeded files - rm -f "${D}"${docdir}/{SCSIRAS,COPYING} - # install modepage files - insinto /usr/share/${PN} - doins files/*.mdf - # new docs - dodoc ChangeLog AUTHORS TODO -} diff --git a/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild b/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild deleted file mode 100644 index a0fd6aa0e5f1..000000000000 --- a/sys-block/scsirastools/scsirastools-1.6.4-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools epatch - -DESCRIPTION="Serviceability for SCSI Disks and Arrays" -HOMEPAGE="http://scsirastools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=">=sys-apps/sg3_utils-1.44" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.7-sysmacros.patch #580214 - # this builds a really old mdadm - sed -i \ - -e '/RPMB/d' \ - -e '/^SUBDIRS/s,mdadm.d,,' \ - -e '/^SUBDIRS/s,files,,' \ - Makefile.am || die "sed Makefile.am failed" - eautoreconf - # i386 ELF binaries in tarball = bad - rm "${S}"/files/ialarms* || die - - # Fix up /sbin instances to be /usr/sbin instead - for i in src/sgraidmon.c src/sgdiskmon.c ; do - sed -i "${S}"/${i} \ - -e '/evtcmd\[\].*\"\/sbin\//s,/sbin/,/usr/sbin/,' \ - || die "Failed to set /sbin in sources" - done -} - -src_configure() { - econf --sbindir=/usr/sbin -} - -src_install() { - local docdir="/usr/share/doc/${PF}" - emake install DESTDIR="${D}" datato="${ED}${docdir}" - dosbin files/sgevt files/mdevt - rm -f "${ED}${docdir}"/{SCSIRAS,COPYING} - # install modepage files - insinto /usr/share/${PN} - doins files/*.mdf - dodoc ChangeLog AUTHORS TODO -} -- cgit v1.2.3-65-gdbad