mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 04:16:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/samba: upgrade to 4.20.2

Browse Source
This commit is contained in:
Noel Kuntze 2024-06-26 04:34:36 +02:00 committed by Natanael Copa
parent e8574c7cb1
commit d5c00fc0dc
2 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/samba/APKBUILD
View File

@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
pkgver=4.20.1
pkgver=4.20.2
pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="https://www.samba.org/"
@ -97,7 +97,6 @@ makedepends="
# "
source="
https://download.samba.org/pub/samba/stable/samba-$pkgver.tar.gz
samba-reproducible-builds.patch
musl_uintptr.patch
default-config.patch
@ -670,8 +669,7 @@ libs() {
}
sha512sums="
bea2bacae5b3272045399057ddf88d8f38203dde04c718b0088fd45792cccd68047b413e66bca7418b19db8580879358b86531a8d6f2d76fbcd902c331050a84 samba-4.20.1.tar.gz
006763da309d2e9b7c6a9943ff1a28bbe63832f1aa9ed99201f0f8b4d9015040040119efe20c5ec5af9cdba208d9731f0aadace9e5ddad66426317ee9ef19a58 samba-reproducible-builds.patch
ff2c24314c6a35cc42db36a9021241b1323e810bf746e3975bc103f26daf395cd3c32da72e7172e322dee480587bbb1daac939e9851ff65be493be6fb4fc3eda samba-4.20.2.tar.gz
b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93 musl_uintptr.patch
14666954aec4a0bc7a6730ba3a9afdbd4e27c083a038d9a1f5a033e4f0a42bc8408906612ea51f74bf743ff8a225242e54b0a518367fe526b110639bfbfdd071 default-config.patch
4f1bf368aadb9f88276357297ce8967c4b663d472a6d90e70e8824714eaab96e6f7d88c5fbed68435c1728f813725632c51d8d6d8388250a485aaf0bb44731ab samba.initd

32
main/samba/samba-reproducible-builds.patch
View File

@ -1,32 +0,0 @@
From 9995c5c234ece6888544cdbe6578d47e83dea0b5 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sat, 13 Apr 2024 12:54:28 +0200
Subject: [PATCH] workaround for reproducibility issue
Workaround for the issues described in
https://bugzilla.samba.org/show_bug.cgi?id=15632
Probably `$n` should not have been a hash in the first place,
but this at least seems like an incremental improvement and
makes the package reproducible again.
---
pidl/lib/Parse/Pidl/Typelist.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index 31ea19e357c..f66e8de5fc7 100644
--- a/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
@@ -315,7 +315,8 @@ sub mapType($$)
return mapType($t->{DATA}, $n) if ($t->{TYPE} eq "TYPEDEF");
return mapScalarType($n) if ($t->{TYPE} eq "SCALAR");
return "enum $n" if ($t->{TYPE} eq "ENUM");
- return "struct $n" if ($t->{TYPE} eq "STRUCT" or $t->{TYPE} eq "INTERFACE");
+ return "struct $n" if (($t->{TYPE} eq "STRUCT" or $t->{TYPE} eq "INTERFACE") and not ref($n) eq "HASH");
+ return "struct $n->{NAME}" if ($t->{TYPE} eq "STRUCT" or $t->{TYPE} eq "INTERFACE");
return "union $n" if ($t->{TYPE} eq "UNION");
return mapScalarType(bitmap_type_fn($t)) if ($t->{TYPE} eq "BITMAP");
return "struct $n" if ($t->{TYPE} eq "PIPE");
--
GitLab