joborun-pkg/jobextra
joborun-pkg
/
jobextra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upg samba ethtool

This commit is contained in:
joborun linux 2022-10-12 06:28:17 +03:00
parent b5e2eb7e46
commit 682bb2e704
7 changed files with 113 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ethtool/PKGBUILD
View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=ethtool
pkgver=5.19
pkgver=6.0
pkgrel=01
epoch=1
pkgdesc="Utility for controlling network drivers and hardware"
@ -38,7 +38,5 @@ license=('GPL')
validpgpkeys=(CE4A4D080F0D304F23B9EBDD972D5BF4DC613806 # John W. Linville <linville@kernel.org>
D2CB120AB45957B721CD9596F4554567B91DE934) # Michal Kubecek <mkubecek@suse.cz>
sha256sums=(3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 # ethtool-5.19.tar.xz
9d77ba0dd17177e0b6565f97ba3d6cff58a0a9a0f88740e75969ba594515a0df) # ethtool-5.19.tar.sign
sha256sums=(d5446c93de570ce68f3b1ea69dbfa12fcfd67fc19897f655d3f18231e2b818d6 # ethtool-6.0.tar.xz
434766551c76e7dfc1b24fc0b14eb7278b3ae772b1b81d7d0c91ca250997afda) # ethtool-6.0.tar.sign

4
ethtool/PKGBUILD-arch
View File

@ -3,7 +3,7 @@
# Contributor: Martin Kemp <mdkemp@elys.com>
pkgname=ethtool
pkgver=5.19
pkgver=6.0
pkgrel=1
epoch=1
pkgdesc="Utility for controlling network drivers and hardware"
@ -12,7 +12,7 @@ url="https://www.kernel.org/pub/software/network/ethtool/"
license=('GPL')
depends=('glibc' 'libmnl')
source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.{xz,sign})
sha1sums=('00bfe4a24c7d8ddf94d87407cc54a58e9c8947d5'
sha1sums=('ea1f37d788b6f6b516919c1f46fbc4c55ade1b4a'
'SKIP')
validpgpkeys=(CE4A4D080F0D304F23B9EBDD972D5BF4DC613806 # John W. Linville <linville@kernel.org>
D2CB120AB45957B721CD9596F4554567B91DE934) # Michal Kubecek <mkubecek@suse.cz>

1
ethtool/deps
View File

@ -1,2 +1,3 @@

16
samba/PKGBUILD
View File

@ -8,7 +8,7 @@
pkgbase=samba
pkgname=('smbclient' 'samba')
pkgver=4.17.0
pkgrel=01
pkgrel=02
arch=(x86_64)
url="https://www.samba.org"
makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups'
@ -23,13 +23,15 @@ source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc
samba.logrotate
samba.pam
samba.sysconfig
samba.tmpfiles)
samba.tmpfiles
samba-4.17.0-15195.patch)
### UNINSTALL dmapi package before building!!!
#prepare() {
# cd samba-${pkgver}
#}
prepare() {
cd samba-${pkgver}
patch -Np1 -i ${srcdir}/samba-4.17.0-15195.patch
}
build() {
# Use samba-pkg as a staging directory for the split packages
@ -203,5 +205,7 @@ sha256sums=(04868ecda82fcbeda7b8bf519a2461a64d55c6e70efc6f6053b2fbba55f1823a #
0b570570ea49f82e6f9da47b1cce3b441859f52de105b54d4d79b873b924623f # samba.logrotate
57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5 # samba.pam
f2d11032015ef917f4af50f3933d432fa744b5f846ab4d980247e329e52d34bc # samba.sysconfig
5398a42ccb36ac3b87cfa42c8050b535efc2ca38ab3b9354a52f4e0fe71b5800) # samba.tmpfiles
5398a42ccb36ac3b87cfa42c8050b535efc2ca38ab3b9354a52f4e0fe71b5800 # samba.tmpfiles
3d57f68f01179dab162cd5e46c6e8e6bbb8a1e9bf59d196f74c1101d733cfb12) # samba-4.17.0-15195.patch

15
samba/PKGBUILD-arch
View File

@ -11,7 +11,7 @@
pkgbase=samba
pkgname=('smbclient' 'samba')
pkgver=4.17.0
pkgrel=1
pkgrel=2
arch=(x86_64)
url="https://www.samba.org"
license=('GPL3')
@ -28,18 +28,21 @@ optdepends=(
source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
samba.logrotate
samba.pam
samba.conf)
samba.conf
samba-4.17.0-15195.patch)
validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs@samba.org>
sha512sums=('7c590ca2c3e05a52f67c190643819668fd4aeefb251d36c2a9a9b17ce078c0ea2375c4b8bde8a4fabe517465c90ab3a33fd72cf447358c9af89bf7492f7cdaa1'
'SKIP'
'2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
'1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc')
'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc'
'd1e9c930de56016dc3cc4c2c2c56d85b100dc06d54bc7045fa4eba13a8c7fa4864c51cc784b002b51fdffa91d817dd3a86d1e3a3afd89fc0866c2676060e5581')
### UNINSTALL dmapi package before building!!!
#prepare() {
# cd samba-${pkgver}
#}
prepare() {
cd samba-${pkgver}
patch -Np1 -i ${srcdir}/samba-4.17.0-15195.patch
}
build() {
# Use samba-pkg as a staging directory for the split packages

3
samba/deps
View File

@ -16,5 +16,6 @@ rpcsvc-proto
liburing
perl-json
glusterfs
bison

86
samba/samba-4.17.0-15195.patch Normal file
View File

@ -0,0 +1,86 @@
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index fa301b9fa18..98750754036 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -464,6 +464,7 @@ SMBC_getatr(SMBCCTX * context,
struct timespec access_time_ts = {0};
struct timespec write_time_ts = {0};
struct timespec change_time_ts = {0};
+ struct timespec w_time_ts = {0};
time_t write_time = 0;
SMB_INO_T ino = 0;
struct cli_credentials *creds = NULL;
@@ -506,6 +507,7 @@ SMBC_getatr(SMBCCTX * context,
}
if (!srv->no_pathinfo2) {
+ bool not_supported_error = false;
status = cli_qpathinfo2(targetcli,
targetpath,
&create_time_ts,
@@ -518,11 +520,21 @@ SMBC_getatr(SMBCCTX * context,
if (NT_STATUS_IS_OK(status)) {
goto setup_stat;
}
+ if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) ||
+ NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+ not_supported_error = true;
+ }
+ if (!not_supported_error) {
+ /* "Normal error". Just return it to caller. */
+ TALLOC_FREE(frame);
+ return status;
+ }
}
srv->no_pathinfo2 = True;
if (!srv->no_pathinfo3) {
+ bool not_supported_error = false;
status = cli_qpathinfo3(targetcli,
targetpath,
&create_time_ts,
@@ -535,6 +547,15 @@ SMBC_getatr(SMBCCTX * context,
if (NT_STATUS_IS_OK(status)) {
goto setup_stat;
}
+ if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL) ||
+ NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+ not_supported_error = true;
+ }
+ if (!not_supported_error) {
+ /* "Normal error". Just return it to caller. */
+ TALLOC_FREE(frame);
+ return status;
+ }
}
srv->no_pathinfo3 = True;
@@ -545,14 +566,11 @@ SMBC_getatr(SMBCCTX * context,
}
status = cli_getatr(targetcli, targetpath, &attr, &size, &write_time);
- if (NT_STATUS_IS_OK(status)) {
- struct timespec w_time_ts =
- convert_time_t_to_timespec(write_time);
-
- access_time_ts = change_time_ts = write_time_ts = w_time_ts;
-
- goto setup_stat;
+ if (!NT_STATUS_IS_OK(status)) {
+ goto all_failed;
}
+ w_time_ts = convert_time_t_to_timespec(write_time);
+ access_time_ts = change_time_ts = write_time_ts = w_time_ts;
setup_stat:
setup_stat(sb,
@@ -573,7 +591,7 @@ all_failed:
srv->no_pathinfo3 = False;
TALLOC_FREE(frame);
- return NT_STATUS_ACCESS_DENIED;
+ return status;
}
/*