Skip to content

Commit 444725e

Browse files
committed
repos: refresh patches
- drops `index`
1 parent 79aefda commit 444725e

File tree

19 files changed

+6
-96
lines changed

19 files changed

+6
-96
lines changed

repos/patches-arm32/proxmox-backup/platform.armhf.patch

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
From 08e19e66fab8280161495c81f688a330fc80e4f5 Mon Sep 17 00:00:00 2001
2-
From: Kamil Trzcinski <[email protected]>
3-
Date: Fri, 25 Jul 2025 22:04:22 +0200
4-
Subject: [PATCH] arm32
5-
6-
---
7-
pbs-client/src/pxar/create.rs | 10 +++++-----
8-
pbs-client/src/pxar/extract.rs | 4 ++--
9-
pbs-client/src/pxar/metadata.rs | 4 ++--
10-
pbs-config/src/acl.rs | 7 +++----
11-
pbs-config/src/user.rs | 7 +++----
12-
pbs-datastore/src/chunk_store.rs | 4 ++--
13-
pbs-datastore/src/fixed_index.rs | 6 +++---
14-
pbs-fuse-loop/src/fuse_loop.rs | 4 ++--
15-
pbs-pxar-fuse/src/lib.rs | 12 ++++++------
16-
9 files changed, 28 insertions(+), 30 deletions(-)
17-
181
diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
19-
index 7f605a61..4a1a16be 100644
202
--- a/pbs-client/src/pxar/create.rs
213
+++ b/pbs-client/src/pxar/create.rs
224
@@ -79,7 +79,7 @@ fn detect_fs_type(fd: RawFd) -> Result<i64, Errno> {
@@ -65,7 +47,6 @@ index 7f605a61..4a1a16be 100644
6547
..Default::default()
6648
};
6749
diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs
68-
index c4d0085c..dad3cd2f 100644
6950
--- a/pbs-client/src/pxar/extract.rs
7051
+++ b/pbs-client/src/pxar/extract.rs
7152
@@ -727,7 +727,7 @@ impl Extractor {
@@ -87,7 +68,6 @@ index c4d0085c..dad3cd2f 100644
8768
Err(nix::errno::Errno::EINTR) => true,
8869
Err(err) => return Err(err).context("error setting file size"),
8970
diff --git a/pbs-client/src/pxar/metadata.rs b/pbs-client/src/pxar/metadata.rs
90-
index d03cf7e2..bf71679f 100644
9171
--- a/pbs-client/src/pxar/metadata.rs
9272
+++ b/pbs-client/src/pxar/metadata.rs
9373
@@ -45,10 +45,10 @@ fn timestamp_to_update_timespec(mtime: &pxar::format::StatxTimestamp) -> [libc::
@@ -104,10 +84,9 @@ index d03cf7e2..bf71679f 100644
10484
},
10585
]
10686
diff --git a/pbs-config/src/acl.rs b/pbs-config/src/acl.rs
107-
index aca1f68f..671ca44c 100644
10887
--- a/pbs-config/src/acl.rs
10988
+++ b/pbs-config/src/acl.rs
110-
@@ -731,8 +731,7 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
89+
@@ -737,8 +737,7 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
11190
let cache = CACHED_CONFIG.read().unwrap();
11291
if let Some(ref config) = cache.data {
11392
if let Some(stat) = stat {
@@ -117,7 +96,7 @@ index aca1f68f..671ca44c 100644
11796
return Ok(config.clone());
11897
}
11998
} else if cache.last_mtime == 0 && cache.last_mtime_nsec == 0 {
120-
@@ -746,8 +745,8 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
99+
@@ -752,8 +751,8 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
121100

122101
let mut cache = CACHED_CONFIG.write().unwrap();
123102
if let Some(stat) = stat {
@@ -129,7 +108,6 @@ index aca1f68f..671ca44c 100644
129108
cache.data = Some(config.clone());
130109

131110
diff --git a/pbs-config/src/user.rs b/pbs-config/src/user.rs
132-
index 08d141e6..1bff3c4f 100644
133111
--- a/pbs-config/src/user.rs
134112
+++ b/pbs-config/src/user.rs
135113
@@ -96,8 +96,7 @@ pub fn cached_config() -> Result<Arc<SectionConfigData>, Error> {
@@ -154,7 +132,6 @@ index 08d141e6..1bff3c4f 100644
154132
cache.data = Some(config.clone());
155133

156134
diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
157-
index 3c59612b..0340d7f1 100644
158135
--- a/pbs-datastore/src/chunk_store.rs
159136
+++ b/pbs-datastore/src/chunk_store.rs
160137
@@ -408,7 +408,7 @@ impl ChunkStore {
@@ -176,7 +153,6 @@ index 3c59612b..0340d7f1 100644
176153
status.still_bad += 1;
177154
} else {
178155
diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs
179-
index 8d9173e8..ae79c045 100644
180156
--- a/pbs-datastore/src/fixed_index.rs
181157
+++ b/pbs-datastore/src/fixed_index.rs
182158
@@ -111,7 +111,7 @@ impl FixedIndexReader {
@@ -207,7 +183,6 @@ index 8d9173e8..ae79c045 100644
207183
}?
208184
.as_ptr()
209185
diff --git a/pbs-fuse-loop/src/fuse_loop.rs b/pbs-fuse-loop/src/fuse_loop.rs
210-
index d55be3b0..711354bc 100644
211186
--- a/pbs-fuse-loop/src/fuse_loop.rs
212187
+++ b/pbs-fuse-loop/src/fuse_loop.rs
213188
@@ -177,7 +177,7 @@ impl<R: AsyncRead + AsyncSeek + Unpin> FuseLoopSession<R> {
@@ -228,7 +203,6 @@ index d55be3b0..711354bc 100644
228203
stat
229204
}
230205
diff --git a/pbs-pxar-fuse/src/lib.rs b/pbs-pxar-fuse/src/lib.rs
231-
index 4322c06e..ccb0c17d 100644
232206
--- a/pbs-pxar-fuse/src/lib.rs
233207
+++ b/pbs-pxar-fuse/src/lib.rs
234208
@@ -546,7 +546,7 @@ impl SessionImpl {
@@ -265,6 +239,3 @@ index 4322c06e..ccb0c17d 100644
265239
stat.st_ctime_nsec = metadata.stat.mtime.nanos as _;
266240
Ok(stat)
267241
}
268-
--
269-
2.39.2
270-

repos/patches-arm32/proxmox-backup/proxmox-fuse/platform.armhf.patch

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
1-
From a3cfcb6489bd2bb8e991ede9fd7a935a4ce9f995 Mon Sep 17 00:00:00 2001
2-
From: Kamil Trzcinski <[email protected]>
3-
Date: Fri, 25 Jul 2025 22:04:36 +0200
4-
Subject: [PATCH] arm32
5-
6-
---
7-
src/requests.rs | 8 ++++----
8-
src/session.rs | 4 ++--
9-
2 files changed, 6 insertions(+), 6 deletions(-)
10-
111
diff --git a/src/requests.rs b/src/requests.rs
12-
index 9bdab30..15fe804 100644
132
--- a/src/requests.rs
143
+++ b/src/requests.rs
154
@@ -362,7 +362,7 @@ impl ReaddirPlus {
@@ -49,7 +38,6 @@ index 9bdab30..15fe804 100644
4938
None
5039
}
5140
diff --git a/src/session.rs b/src/session.rs
52-
index 427ce46..02048c0 100644
5341
--- a/src/session.rs
5442
+++ b/src/session.rs
5543
@@ -109,7 +109,7 @@ impl FuseData {
@@ -70,6 +58,3 @@ index 427ce46..02048c0 100644
7058
)));
7159
}
7260

73-
--
74-
2.39.2
75-

repos/patches-arm32/proxmox-backup/proxmox/platform.armhf.patch

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
1-
From 06fa463a208338ad397e9581759bb3c26f7f2ee2 Mon Sep 17 00:00:00 2001
2-
From: Kamil Trzcinski <[email protected]>
3-
Date: Fri, 25 Jul 2025 22:04:16 +0200
4-
Subject: [PATCH] arm32
5-
6-
---
7-
proxmox-access-control/src/acl.rs | 7 +++----
8-
proxmox-access-control/src/user.rs | 8 +++++---
9-
proxmox-shared-memory/src/lib.rs | 2 +-
10-
proxmox-sys/src/crypt.rs | 2 +-
11-
proxmox-sys/src/fs/mod.rs | 2 +-
12-
proxmox-sys/src/linux/timer.rs | 4 ++--
13-
proxmox-sys/src/process_locker.rs | 2 +-
14-
proxmox-time/src/posix.rs | 6 ++++--
15-
8 files changed, 18 insertions(+), 15 deletions(-)
16-
171
diff --git a/proxmox-access-control/src/acl.rs b/proxmox-access-control/src/acl.rs
18-
index b8041688..f6b4f456 100644
192
--- a/proxmox-access-control/src/acl.rs
203
+++ b/proxmox-access-control/src/acl.rs
214
@@ -596,8 +596,7 @@ pub fn cached_config() -> Result<Arc<AclTree>, Error> {
@@ -40,7 +23,6 @@ index b8041688..f6b4f456 100644
4023
cache.data = Some(config.clone());
4124

4225
diff --git a/proxmox-access-control/src/user.rs b/proxmox-access-control/src/user.rs
43-
index 95b70f25..bf0bb255 100644
4426
--- a/proxmox-access-control/src/user.rs
4527
+++ b/proxmox-access-control/src/user.rs
4628
@@ -83,7 +83,9 @@ pub fn cached_config() -> Result<Arc<SectionConfigData>, Error> {
@@ -66,7 +48,6 @@ index 95b70f25..bf0bb255 100644
6648
cache.data = Some(config.clone());
6749

6850
diff --git a/proxmox-shared-memory/src/lib.rs b/proxmox-shared-memory/src/lib.rs
69-
index b067d1b9..e8a994a8 100644
7051
--- a/proxmox-shared-memory/src/lib.rs
7152
+++ b/proxmox-shared-memory/src/lib.rs
7253
@@ -145,7 +145,7 @@ impl<T: Sized + Init> SharedMemory<T> {
@@ -79,7 +60,6 @@ index b067d1b9..e8a994a8 100644
7960
// link the file into place:
8061
let proc_path = format!("/proc/self/fd/{}\0", file.as_raw_fd());
8162
diff --git a/proxmox-sys/src/crypt.rs b/proxmox-sys/src/crypt.rs
82-
index 508b9c15..3b7ee7eb 100644
8363
--- a/proxmox-sys/src/crypt.rs
8464
+++ b/proxmox-sys/src/crypt.rs
8565
@@ -112,7 +112,7 @@ pub fn crypt_gensalt(prefix: &str, count: u64, rbytes: &[u8]) -> Result<String,
@@ -92,7 +72,6 @@ index 508b9c15..3b7ee7eb 100644
9272
rbytes.len().try_into()?,
9373
output.as_mut_ptr(),
9474
diff --git a/proxmox-sys/src/fs/mod.rs b/proxmox-sys/src/fs/mod.rs
95-
index 752b75d2..4556eac0 100644
9675
--- a/proxmox-sys/src/fs/mod.rs
9776
+++ b/proxmox-sys/src/fs/mod.rs
9877
@@ -170,7 +170,7 @@ pub fn fs_info<P: ?Sized + nix::NixPath>(path: &P) -> nix::Result<FileSystemInfo
@@ -105,7 +84,6 @@ index 752b75d2..4556eac0 100644
10584
})
10685
}
10786
diff --git a/proxmox-sys/src/linux/timer.rs b/proxmox-sys/src/linux/timer.rs
108-
index bb01dc81..0b0eccd1 100644
10987
--- a/proxmox-sys/src/linux/timer.rs
11088
+++ b/proxmox-sys/src/linux/timer.rs
11189
@@ -106,8 +106,8 @@ fn opt_duration_to_timespec(v: Option<Duration>) -> libc::timespec {
@@ -120,7 +98,6 @@ index bb01dc81..0b0eccd1 100644
12098
}
12199
}
122100
diff --git a/proxmox-sys/src/process_locker.rs b/proxmox-sys/src/process_locker.rs
123-
index 65d2793a..d5a32ddb 100644
124101
--- a/proxmox-sys/src/process_locker.rs
125102
+++ b/proxmox-sys/src/process_locker.rs
126103
@@ -160,7 +160,7 @@ impl ProcessLocker {
@@ -133,7 +110,6 @@ index 65d2793a..d5a32ddb 100644
133110
Ok(guard)
134111
}
135112
diff --git a/proxmox-time/src/posix.rs b/proxmox-time/src/posix.rs
136-
index c2146c47..e89876ea 100644
137113
--- a/proxmox-time/src/posix.rs
138114
+++ b/proxmox-time/src/posix.rs
139115
@@ -15,7 +15,7 @@ pub fn timelocal(t: &mut libc::tm) -> Result<i64, Error> {
@@ -170,6 +146,3 @@ index c2146c47..e89876ea 100644
170146
if libc::gmtime_r(&epoch, &mut result).is_null() {
171147
bail!("libc::gmtime failed for '{epoch}'");
172148
}
173-
--
174-
2.39.2
175-

repos/patches/proxmox-backup/0001-zstd-dynamic.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
diff --git a/Cargo.toml b/Cargo.toml
2-
index ea413328..b2980c73 100644
32
--- a/Cargo.toml
43
+++ b/Cargo.toml
5-
@@ -160,7 +160,7 @@ udev = "0.9"
4+
@@ -162,7 +162,7 @@ udev = "0.9"
65
url = "2.1"
76
walkdir = "2"
87
xdg = "2.2"

repos/patches/proxmox-backup/debian-cargo-config.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
diff --git a/debian/rules b/debian/rules
2-
index aa4571ff..0fbb29e7 100755
32
--- a/debian/rules
43
+++ b/debian/rules
5-
@@ -38,9 +38,9 @@ endif
4+
@@ -37,9 +37,9 @@ endif
65
override_dh_auto_configure:
76
@perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(DEB_VERSION_UPSTREAM)"; \
87
die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml

repos/patches/proxmox-backup/fix-cargo.patch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff --git a/debian/rules b/debian/rules
2-
index ab48cce1..0a540d4f 100755
32
--- a/debian/rules
43
+++ b/debian/rules
54
@@ -18,7 +18,7 @@ STATIC_COMPILEDIR := $(STATIC_TARGET_DIR)/$(DEB_HOST_RUST_TYPE)/debug

repos/patches/proxmox-backup/fix-kernel-version.patch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js
2-
index a8673f6b..1ead89bd 100644
32
--- a/www/panel/NodeInfo.js
43
+++ b/www/panel/NodeInfo.js
54
@@ -150,7 +150,7 @@ Ext.define('PBS.NodeInfoPanel', {

repos/patches/proxmox-backup/hide-shell.patch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff --git a/www/NavigationTree.js b/www/NavigationTree.js
2-
index 649692c8..cec8d5a9 100644
32
--- a/www/NavigationTree.js
43
+++ b/www/NavigationTree.js
54
@@ -95,12 +95,6 @@ Ext.define('PBS.store.NavigationStore', {

repos/patches/proxmox-backup/multi-arch.patch

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
diff --git a/debian/proxmox-backup-file-restore.install b/debian/proxmox-backup-file-restore.install
22
old mode 100644
33
new mode 100755
4-
index 409988a3..8b4034bd
54
--- a/debian/proxmox-backup-file-restore.install
65
+++ b/debian/proxmox-backup-file-restore.install
76
@@ -1,4 +1,5 @@
@@ -14,15 +13,14 @@ index 409988a3..8b4034bd
1413
diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install
1514
old mode 100644
1615
new mode 100755
17-
index 40d8459f..466bd621
1816
--- a/debian/proxmox-backup-server.install
1917
+++ b/debian/proxmox-backup-server.install
2018
@@ -1,3 +1,4 @@
2119
+#! /usr/bin/dh-exec
2220
etc/pbs-enterprise.sources /etc/apt/sources.list.d/
21+
etc/pbs-network-config-commit.service /usr/lib/systemd/system/
2322
etc/proxmox-backup-banner.service /usr/lib/systemd/system/
24-
etc/proxmox-backup-daily-update.service /usr/lib/systemd/system/
25-
@@ -8,11 +9,11 @@ etc/[email protected] /usr/lib/systemd/system/
23+
@@ -9,11 +10,11 @@ etc/[email protected] /usr/lib/systemd/system/
2624
usr/bin/pmt
2725
usr/bin/pmtx
2826
usr/bin/proxmox-tape
@@ -40,7 +38,6 @@ index 40d8459f..466bd621
4038
usr/sbin/proxmox-backup-debug
4139
usr/sbin/proxmox-backup-manager
4240
diff --git a/debian/rules b/debian/rules
43-
index 0a540d4f..aa4571ff 100755
4441
--- a/debian/rules
4542
+++ b/debian/rules
4643
@@ -2,6 +2,7 @@

repos/patches/proxmox-biome/any-arch.patch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff --git a/debian/control b/debian/control
2-
index bcfa86d0..83d2d6b4 100644
32
--- a/debian/control
43
+++ b/debian/control
54
@@ -7,7 +7,7 @@ Homepage: https://biomejs.dev/

0 commit comments

Comments
 (0)