From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- .../files/scsirastools-1.5.6-glibc-2.10.patch | 87 ---------------------- .../files/scsirastools-1.5.7-sysmacros.patch | 23 ------ .../files/scsirastools-1.6.6-autotools.patch | 71 ++++++++++++++++++ .../files/scsirastools-1.6.6-prefix.patch | 24 ++++++ 4 files changed, 95 insertions(+), 110 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 create mode 100644 sys-block/scsirastools/files/scsirastools-1.6.6-autotools.patch create mode 100644 sys-block/scsirastools/files/scsirastools-1.6.6-prefix.patch (limited to 'sys-block/scsirastools/files') 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/files/scsirastools-1.6.6-autotools.patch b/sys-block/scsirastools/files/scsirastools-1.6.6-autotools.patch new file mode 100644 index 000000000000..d4f6e222e112 --- /dev/null +++ b/sys-block/scsirastools/files/scsirastools-1.6.6-autotools.patch @@ -0,0 +1,71 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,42 +1,2 @@ +-#!/bin/sh +-# Makefile to build/install doc files +-# +-TOPDIR = ${top_srcdir} +-fromd = $(TOPDIR)/doc +-MKDIR = sh $(TOPDIR)/mkinstalldirs +-INSTALL_SH = sh $(TOPDIR)/install-sh +-INSTALL_DATA_CMD = ${INSTALL_SH} -c -m 644 +-INSTALL_SCRIPT_CMD = ${INSTALL_SH} -c -m 755 +-prefix = /usr +-exe_prefix = +- +-datadir = ${prefix}/share +-mandir = ${prefix}/share/man +-sysconfdir = ${exe_prefix}/etc +-sbindir = ${exe_prefix}/sbin +-datato = ${DESTDIR}${datadir}/scsirastools +- +-sbin_PROGRAMS = +- +-all: +- +-clean: +- +-distclean: +- +-install: +- $(MKDIR) ${DESTDIR}${mandir}/man8 +- $(MKDIR) ${datato} +- ${INSTALL_DATA_CMD} $(fromd)/sgdefects.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA_CMD} $(fromd)/sgdskfl.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA_CMD} $(fromd)/sgdiag.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA_CMD} $(fromd)/sgmode.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA_CMD} $(fromd)/sgraidmon.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA_CMD} $(fromd)/sgdiskmon.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA_CMD} $(fromd)/sgsafte.8 ${DESTDIR}${mandir}/man8 +- ${INSTALL_DATA_CMD} $(fromd)/UserGuide ${datato} +- ${INSTALL_DATA_CMD} $(TOPDIR)/README ${datato} +- ${INSTALL_DATA_CMD} $(TOPDIR)/COPYING ${datato} +- ${INSTALL_DATA_CMD} $(TOPDIR)/kern/SCSIRAS ${datato} +- +-EXTRA_DIST = ++dist_man_MANS = sgdefects.8 sgdskfl.8 sgdiag.8 sgmode.8 sgraidmon.8 sgdiskmon.8 sgsafte.8 ++dist_doc_DATA = UserGuide +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,20 +1,15 @@ + +-SUBDIRS = mdadm.d src files doc ++SUBDIRS = src doc + PKGDIR = /usr/src/redhat + SOURCEDIR = $(PKGDIR)/SOURCES + BUILDDIR = $(PKGDIR)/BUILD + RSPEC = doc/$(PACKAGE).spec + PNAME = $(PACKAGE)-$(VERSION) + TMPDIR = /tmp/$(PNAME) +-RPMB = rpmbuild + + rpm: $(RSPEC) + make tarball +- $(RPMB) -bs $(RSPEC) +- $(RPMB) -bb $(RSPEC) + +-# $(RPMB) --rebuild $(PKGDIR)/SRPMS/$(PNAME)-1.i386.rpm +-# $(RPMB) -bb --buildroot $(BUILDDIR)/$(PNAME) $(RSPEC) + + tarball: + rm -f $(SOURCEDIR)/$(PNAME).tar.gz diff --git a/sys-block/scsirastools/files/scsirastools-1.6.6-prefix.patch b/sys-block/scsirastools/files/scsirastools-1.6.6-prefix.patch new file mode 100644 index 000000000000..5d52ec7db003 --- /dev/null +++ b/sys-block/scsirastools/files/scsirastools-1.6.6-prefix.patch @@ -0,0 +1,24 @@ +* binaries get installed into /usr/sbin + +--- a/src/sgdiskmon.c ++++ b/src/sgdiskmon.c +@@ -80,7 +80,7 @@ + ////////////////////////////////////////////////////////////////////// + char *progver = "1.66"; /* program version */ + char *progname = "sgdiskmon"; /* program name */ +-char sgevtcmd[] = "/sbin/sgevt"; ++char sgevtcmd[] = "/usr/sbin/sgevt"; + char initscript[] = "/etc/init.d/sgdisk"; + char logfile[] = "/var/log/sgdiskmon.log"; /* log filename */ + FILE *fdlog = NULL; /* log file descriptor */ +--- a/src/sgraidmon.c ++++ b/src/sgraidmon.c +@@ -152,7 +152,7 @@ + ////////////////////////////////////////////////////////////////////// + char *progver = "1.66"; /* program version */ + char *progname = "sgraidmon"; /* program name */ +-char mdevtcmd[] = "/sbin/mdevt"; ++char mdevtcmd[] = "/usr/sbin/mdevt"; + char initscript[] = "/etc/init.d/sgraid"; + char logfile[] = "/var/log/sgraidmon.log"; /* log filename */ + FILE *fdlog = NULL; /* log file descriptor */ -- cgit v1.2.3