commit: ee64edf8db335dd58042244898669b486cf69e4a Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Mar 1 16:51:52 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Mar 2 00:02:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee64edf8
app-admin/hddtemp: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11182 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/hddtemp-0.3_beta15-byteswap.patch | 28 ---------------------- .../files/hddtemp-0.3_beta15-execinfo.patch | 21 ---------------- .../files/hddtemp-0.3_beta15-satacmds.patch | 26 -------------------- app-admin/hddtemp/files/hddtemp.service | 11 --------- 4 files changed, 86 deletions(-) diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch deleted file mode 100644 index 7b0dddc2ae4..00000000000 --- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/sata.c hddtemp-0.3-beta15/src/sata.c ---- hddtemp-0.3-beta15.orig/src/sata.c 2006-05-14 02:09:55.579437498 -0700 -+++ hddtemp-0.3-beta15/src/sata.c 2006-05-14 02:06:08.495948437 -0700 -@@ -88,7 +88,9 @@ - return strdup(_("unknown")); - else - { -+ //fprintf(stderr,"sata_model1=%s\n",identify + 54); - sata_fixstring(identify + 54, 24); -+ //fprintf(stderr,"sata_model2=%s\n",identify + 54); - return strdup(identify + 54); - } - } -diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c ---- hddtemp-0.3-beta15.orig/src/satacmds.c 2006-05-14 02:09:40.983470339 -0700 -+++ hddtemp-0.3-beta15/src/satacmds.c 2006-05-14 02:09:02.319557333 -0700 -@@ -98,7 +98,10 @@ - /* convert from big-endian to host byte order */ - for (p = end ; p != s;) { - unsigned short *pp = (unsigned short *) (p -= 2); -- *pp = ntohs(*pp); -+ char tmp = p[0]; -+ p[0] = p[1]; -+ p[1] = tmp; -+ //*pp = ntohs(*pp); - } - - /* strip leading blanks */ diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch deleted file mode 100644 index 1e7239535d4..00000000000 --- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hddtemp-0.3-beta15/configure.in~ 2005-10-17 19:14:19 +0000 -+++ hddtemp-0.3-beta15/configure.in 2006-12-11 18:23:22 +0000 -@@ -18,6 +18,7 @@ - AC_HEADER_STDC - AC_CHECK_HEADERS(fcntl.h) - AC_CHECK_HEADERS(netinet/in.h) -+AC_CHECK_HEADERS(execinfo.h) - AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>]) - - # Checks for typedefs, structures, and compiler characteristics. ---- hddtemp-0.3-beta15/src/backtrace.c-orig 2006-12-11 18:20:41 +0000 -+++ hddtemp-0.3-beta15/src/backtrace.c 2006-12-11 18:23:28 +0000 -@@ -18,7 +18,7 @@ - - #include <features.h> - --#if defined(__i386__) && defined(__GLIBC__) -+#ifdef HAS_EXECINFO_H - - #include <execinfo.h> - diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch deleted file mode 100644 index d67e0681f33..00000000000 --- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naurp hddtemp-0.3-beta15-orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c ---- hddtemp-0.3-beta15-orig/src/satacmds.c 2007-02-10 14:25:15.000000000 +0100 -+++ hddtemp-0.3-beta15/src/satacmds.c 2007-02-10 14:26:53.000000000 +0100 -@@ -54,7 +54,6 @@ int sata_pass_thru(int device, unsigned - unsigned char cdb[16]; - unsigned char sense[32]; - int dxfer_direction; -- int ret; - - memset(cdb, 0, sizeof(cdb)); - cdb[0] = ATA_16; -@@ -78,13 +77,7 @@ int sata_pass_thru(int device, unsigned - cdb[6] = cmd[1]; - cdb[14] = cmd[0]; - -- ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction); -- -- /* Verify SATA magics */ -- if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00) -- return 1; -- else -- return ret; -+ return scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction); - } - - void sata_fixstring(unsigned char *s, int bytecount) diff --git a/app-admin/hddtemp/files/hddtemp.service b/app-admin/hddtemp/files/hddtemp.service deleted file mode 100644 index b2fca4214bc..00000000000 --- a/app-admin/hddtemp/files/hddtemp.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Hard drive temperature monitor daemon -Documentation=man:hddtemp(8) - -[Service] -Environment=HDDTEMP_OPTIONS=--listen=127.0.0.1 -EnvironmentFile=-/etc/conf.d/hddtemp -ExecStart=/usr/sbin/hddtemp -d $HDDTEMP_OPTIONS $HDDTEMP_DRIVES - -[Install] -WantedBy=multi-user.target
