update gvfs-1.54.2, remove libatasmart (in contrib repo)

This commit is contained in:
mac-a-r0ni 2024-06-30 09:57:53 -04:00
parent 26bf6362d1
commit 5a538ebe49
10 changed files with 5 additions and 182 deletions

13
REPO
View File

@ -28,7 +28,6 @@ d:libplist
d:elementary-xfce-icons
d:parole
d:accountsservice
d:libatasmart
d:xfce4-diskperf-plugin
d:xfce4-mpc-plugin
d:xfce4-dict
@ -105,9 +104,9 @@ f:fb1c830be16429c009654167736d5eb4:libxfce4util/.md5sum
f:42c622387895fcf945e672379ab80f5d:orage/.footprint
f:e9c9715a060b34d918e06b0ea1bfda30:orage/Pkgfile
f:a599702dee993b5cf6920dc96a6e0ad8:orage/.md5sum
f:d04de5c18e365bf95a9e16f6942264c4:gvfs/.footprint
f:0c90fa9fc16a1bf9f933ba60901b20da:gvfs/Pkgfile
f:b20ea3e177f18437e8ab19835fbb53fd:gvfs/.md5sum
f:6903de337d4795f3d72325f0fc9e75e7:gvfs/.footprint
f:86a02a4cbce15c24d7c61aabacd9cc1e:gvfs/Pkgfile
f:d96ff9b2091fd557bea4e762e5dc0345:gvfs/.md5sum
f:98fa0a0edf0fbf58e331e51f2dc2bda7:xfce4-sensors-plugin/.footprint
f:a55e6fd520864e38bf29035ce263ef34:xfce4-sensors-plugin/Pkgfile
f:8b7a46fbb64b69fc410ea598c952ed2c:xfce4-sensors-plugin/post-install
@ -189,12 +188,6 @@ f:5a0837ca94201d56ac8b2cf0eac9d8e4:parole/.md5sum
f:6a5253cf3d06fb17d0ae2d2084edc1bf:accountsservice/.footprint
f:142b7ba0da28cc380a3cad981361390f:accountsservice/Pkgfile
f:fb8d6a762f2ae81341a2d24e6ef3d409:accountsservice/.md5sum
f:076c350230a7e161f1feab580ecbcb42:libatasmart/.footprint
f:cebd1fbed0b05d0458177d6d3ad4ea3f:libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch
f:91cc857daf5ddb433f3a6d43b5faf7f2:libatasmart/Pkgfile
f:eb5d0468b0d47d099e5164372a21f9da:libatasmart/0001-Dont-test-undefined-bits.patch
f:0178bb9953f2a0aa20d700426ec6a0a9:libatasmart/post-install
f:3e37929dd16ad0475999ab0d85cd832b:libatasmart/.md5sum
f:3e02643601b4a79de8cbfc4754fcd302:xfce4-diskperf-plugin/.footprint
f:12cf2cb5903758369f03a35027888e35:xfce4-diskperf-plugin/Pkgfile
f:afc9c2899aa94a8fd4b1a5708bf75110:xfce4-diskperf-plugin/.md5sum

View File

@ -16,7 +16,6 @@ drwxr-xr-x root/root usr/lib/gvfs/
-rwxr-xr-x root/root usr/lib/gvfs/gvfsd-afp
-rwxr-xr-x root/root usr/lib/gvfs/gvfsd-afp-browse
-rwxr-xr-x root/root usr/lib/gvfs/gvfsd-archive
-rwxr-xr-x root/root usr/lib/gvfs/gvfsd-burn
-rwxr-xr-x root/root usr/lib/gvfs/gvfsd-computer
-rwxr-xr-x root/root usr/lib/gvfs/gvfsd-dav
-rwxr-xr-x root/root usr/lib/gvfs/gvfsd-ftp
@ -53,7 +52,6 @@ drwxr-xr-x root/root usr/share/gvfs/mounts/
-rw-r--r-- root/root usr/share/gvfs/mounts/afp-browse.mount
-rw-r--r-- root/root usr/share/gvfs/mounts/afp.mount
-rw-r--r-- root/root usr/share/gvfs/mounts/archive.mount
-rw-r--r-- root/root usr/share/gvfs/mounts/burn.mount
-rw-r--r-- root/root usr/share/gvfs/mounts/computer.mount
-rw-r--r-- root/root usr/share/gvfs/mounts/dav.mount
-rw-r--r-- root/root usr/share/gvfs/mounts/ftp.mount

View File

@ -1 +1 @@
4deb7730bcbf87e3aa89d92cb9fd352a gvfs-1.54.1.tar.xz
587c5b279ec3020c597f3ab3f6a73bbd gvfs-1.54.2.tar.xz

View File

@ -6,7 +6,7 @@
# Optional: fuse3 udisks2 avahi libbluray libnfs libcdio-paranoia libimobiledevice
name=gvfs
version=1.54.1
version=1.54.2
release=1
source=(http://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz)

View File

@ -1,17 +0,0 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/atasmart.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libatasmart.la
lrwxrwxrwx root/root usr/lib/libatasmart.so -> libatasmart.so.4.0.5
lrwxrwxrwx root/root usr/lib/libatasmart.so.4 -> libatasmart.so.4.0.5
-rwxr-xr-x root/root usr/lib/libatasmart.so.4.0.5
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libatasmart.pc
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/skdump
-rwxr-xr-x root/root usr/sbin/sktest
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/vala/
drwxr-xr-x root/root usr/share/vala/vapi/
-rw-r--r-- root/root usr/share/vala/vapi/atasmart.vapi

View File

@ -1,3 +0,0 @@
eb5d0468b0d47d099e5164372a21f9da 0001-Dont-test-undefined-bits.patch
cebd1fbed0b05d0458177d6d3ad4ea3f 0002-Drop-our-own-many-bad-sectors-heuristic.patch
53afe2b155c36f658e121fe6def33e77 libatasmart-0.19.tar.xz

View File

@ -1,28 +0,0 @@
Author: Phillip Susi <psusi@ubuntu.com>
Subject: fix an incorrect IO error reading SMART status
Description: The read SMART status command's return status
was testing for a success/failure value that included 8
bits that are "N/A" according to the standard, and required
that they be zeros. At least some drives do not fill them
with zeros, so correct this by masking off the undefined
bits.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61998
Bug-Ubuntu: https://launchpad.net/bugs/1143495
Index: b/atasmart.c
===================================================================
--- a/atasmart.c
+++ b/atasmart.c
@@ -925,10 +925,10 @@
/* SAT/USB bridges truncate packets, so we only check for 4F,
* not for 2C on those */
if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x00C2U)) &&
- cmd[4] == htons(0x4F00U))
+ (cmd[4] & htons(0xFF00U)) == htons(0x4F00U))
*good = TRUE;
else if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x002CU)) &&
- cmd[4] == htons(0xF400U))
+ (cmd[4] & htons(0xFF00U)) == htons(0xF400U))
*good = FALSE;
else {
errno = EIO;

View File

@ -1,93 +0,0 @@
From 6846b7c2431dbeaddd9f931c609b522c04e55732 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Fri, 19 Mar 2010 14:56:06 +0100
Subject: [PATCH 2/2] Drop our own "many bad sectors" heuristic
This currently causes a lot of false positives, because in many cases our
threshold is either overly pessimistically low, or the raw value is implausibly
high. Just use the normalized values vs. threshold for now.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25772
Bug-Ubuntu: https://launchpad.net/bugs/438136
---
atasmart.c | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
Index: libatasmart/atasmart.c
===================================================================
--- libatasmart.orig/atasmart.c 2012-05-23 08:34:14.007836753 +0200
+++ libatasmart/atasmart.c 2012-05-23 08:34:43.903835695 +0200
@@ -130,6 +130,8 @@
SkBool current_pending_sector_found:1;
uint64_t reallocated_sector_count;
uint64_t current_pending_sector;
+ SkBool reallocated_sector_count_bad:1;
+ SkBool current_pending_sector_bad:1;
void *blob;
};
@@ -2190,16 +2192,23 @@
if (a->pretty_unit != SK_SMART_ATTRIBUTE_UNIT_SECTORS)
return;
+ if (!a->current_value_valid)
+ return;
+
if (!strcmp(a->name, "reallocated-sector-count")) {
if (a->pretty_value > d->reallocated_sector_count)
d->reallocated_sector_count = a->pretty_value;
d->reallocated_sector_count_found = TRUE;
+ if (a->good_now_valid && !a->good_now)
+ d->reallocated_sector_count_bad = TRUE;
}
if (!strcmp(a->name, "current-pending-sector")) {
if (a->pretty_value > d->current_pending_sector)
d->current_pending_sector = a->pretty_value;
d->current_pending_sector_found = TRUE;
+ if (a->good_now_valid && !a->good_now)
+ d->current_pending_sector_bad = TRUE;
}
}
@@ -2255,24 +2264,9 @@
return _P(map[overall]);
}
-static uint64_t u64log2(uint64_t n) {
- unsigned r;
-
- if (n <= 1)
- return 0;
-
- r = 0;
- for (;;) {
- n = n >> 1;
- if (!n)
- return r;
- r++;
- }
-}
-
int sk_disk_smart_get_overall(SkDisk *d, SkSmartOverall *overall) {
SkBool good;
- uint64_t sectors, sector_threshold;
+ uint64_t sectors;
assert(d);
assert(overall);
@@ -2293,13 +2287,7 @@
return -1;
sectors = 0;
} else {
-
- /* We use log2(n_sectors)*1024 as a threshold here. We
- * had to pick something, and this makes a bit of
- * sense, or doesn't it? */
- sector_threshold = u64log2(d->size/512) * 1024;
-
- if (sectors >= sector_threshold) {
+ if (d->reallocated_sector_count_bad || d->current_pending_sector_bad) {
*overall = SK_SMART_OVERALL_BAD_SECTOR_MANY;
return 0;
}

View File

@ -1,20 +0,0 @@
# Description: a lean, small and clean implementation of an ATA S.M.A.R.T. reading and parsing library
# URL: http://0pointer.de/blog/projects/being-smart.html
# Packager: Matt Housh, jaeger at crux dot ninja
# Maintainer: mac-a-r0ni, j at lngn dot net
name=libatasmart
version=0.19
release=3
source=(http://0pointer.de/public/$name-$version.tar.xz 0001-Dont-test-undefined-bits.patch 0002-Drop-our-own-many-bad-sectors-heuristic.patch)
build() {
cd $name-$version
patch -Np1 -i $SRC/0001-Dont-test-undefined-bits.patch
patch -Np1 -i $SRC/0002-Drop-our-own-many-bad-sectors-heuristic.patch
./configure --prefix=/usr --build=aarch64-unknown-linux-gnu
make
make DESTDIR=$PKG install
rm -r $PKG/usr/share/doc
rm $PKG/usr/lib/*.la
}

View File

@ -1,7 +0,0 @@
# !/bin/sh
# libatasmart post installation file
#
/usr/bin/libtool --finish /usr/lib
# End post instalation file