diff options
| author | psykose <alice@ayaya.dev> | 2023-03-10 00:49:45 +0000 |
|---|---|---|
| committer | psykose <alice@ayaya.dev> | 2023-03-10 01:53:29 +0100 |
| commit | 45ae93835fa85e8d78ef19092c37012bff8e3488 (patch) | |
| tree | 357a92adade3d1747f071e4131133c787c6fc2b8 | |
| parent | 1a9c11a51d88fa5370582d7ad66df1b2cbace1cb (diff) | |
| download | aports-45ae93835fa85e8d78ef19092c37012bff8e3488.tar.gz aports-45ae93835fa85e8d78ef19092c37012bff8e3488.tar.bz2 aports-45ae93835fa85e8d78ef19092c37012bff8e3488.tar.xz | |
main/samba: upgrade to 4.18.0
https://www.samba.org/samba/history/samba-4.18.0.html
| -rw-r--r-- | main/samba/APKBUILD | 19 | ||||
| -rw-r--r-- | main/samba/missing-headers.patch | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index a9ff8eda730..72b0aed3014 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba -pkgver=4.17.5 -pkgrel=1 +pkgver=4.18.0 +pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="https://www.samba.org/" arch="all" -license="GPL-3.0-or-later LGPL-3.0-or-later" +license="GPL-3.0-or-later AND LGPL-3.0-or-later" subpackages=" $pkgname-dev $pkgname-doc $pkgname-server-openrc libwbclient @@ -80,8 +80,6 @@ makedepends=" zlib-dev $_dc_deps " - -# vfs_btrfs patch from https://bugzilla.samba.org/show_bug.cgi?id=14790 source=" https://download.samba.org/pub/samba/stable/samba-$pkgver.tar.gz netgroup.patch @@ -191,6 +189,8 @@ build() { local _pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 local _auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 + # pclose, .. + export CFLAGS="$CFLAGS -D_BSD_SOURCE -flto=auto" ./configure \ --prefix=/usr \ --sysconfdir=/etc/$pkgname \ @@ -211,7 +211,7 @@ build() { --disable-rpath-install \ --without-gpgme \ --disable-fault-handling - make -j"$(nproc)" + make } package() { @@ -370,7 +370,8 @@ _util_libs() { usr/lib/$pkgname/libsys-rw-samba4.so \ usr/lib/$pkgname/libiov-buf-samba4.so \ usr/lib/$pkgname/libcom-err-samba4.so \ - usr/lib/$pkgname/libreplace-samba4.so + usr/lib/$pkgname/libreplace-samba4.so \ + usr/lib/$pkgname/libstable-sort-samba4.so } # should only depend on samba-util-libs @@ -602,11 +603,11 @@ libs() { } sha512sums=" -352ae8bc161fb07ac6c7330c6ebd02c27eb453ffc1c32c8437edc441ba3044cb2e9b31c8cf181664a2b47098c75a55f06c105f5397c57ce75826ef2af331afa9 samba-4.17.5.tar.gz +bc0eb8bc62fd2c4aa94b452a79e0a31fb3ad52bd46535b5f4c5eff4de8781419c3eb066a8394e704e7d4097c9651932a8de76d5b37cc05547d9a3ed48bf157ae samba-4.18.0.tar.gz f997d0bca9de64a567bccc245bec41e4aa00bacb379d8e348678dcafcf7e723e8716608c5d2d266ad816439b8b93bb8ee28371308a01c9d9c50229f1fc8deb67 netgroup.patch 58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b getpwent_r.patch b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93 musl_uintptr.patch -c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049aca82e58d4daf63ad5553f4c5c51671019bfbbc2781460f0 missing-headers.patch +9642e0de5a39ab940e0f53040ae20fccdbde471bed9bcca713482f26e7c88451e405bd63d719d0548975c7c4c045b51b0006672d34ec4390c3b5a618ea6c8d85 missing-headers.patch 9bf4bbc8b03d9ea17d2f8ffeaf3a83541b171936a90bb8d75b08cc5afbdbaaec545c1b3782c90ae2ffc4568ab4e6f15fb21899d80c654a796301e16429c93b65 musl_rm_unistd_incl.patch bc2df70e327fea5dfbd923600225f1448815d842c37d6937dd74eab7f7699d7f52cd7a8e28a61233974649cf86661a0107dce5019d33b71205e4b41bac73f4e2 add_missing___compar_fn_t.patch c0bbe1186b150a9bb2a0b741a8cfbd7a5109e5fed1eaa07aaa38cf026ebe054d38cc01e2496f0cab7b40f743e1b7ecfbf8a4d5820810226c4152021df65f36dc pidl.patch diff --git a/main/samba/missing-headers.patch b/main/samba/missing-headers.patch index 58c26aece68..6dd38420e62 100644 --- a/main/samba/missing-headers.patch +++ b/main/samba/missing-headers.patch @@ -1,5 +1,5 @@ diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h -index b5d79b9..3f4eae0 100644 +index af6b530..ad799f6 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -31,6 +31,7 @@ @@ -11,7 +11,7 @@ index b5d79b9..3f4eae0 100644 struct parmlist_entry { struct parmlist_entry *prev, *next; diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c -index 3b1ac9c..4044d75 100644 +index 73bffe0..2a03571 100644 --- a/source3/lib/system_smbd.c +++ b/source3/lib/system_smbd.c @@ -27,6 +27,8 @@ @@ -24,7 +24,7 @@ index 3b1ac9c..4044d75 100644 #ifndef HAVE_GETGROUPLIST diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c -index 2cd6122..0c84ec2 100644 +index 2943122..c9b4da7 100644 --- a/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c @@ -20,6 +20,8 @@ |