Skip to content

Commit

Permalink
Fix misplaced library location and update to samba 4.21.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaël Donval authored and gdonval committed Oct 14, 2024
1 parent 4b995fc commit 6b86721
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 25 deletions.
24 changes: 10 additions & 14 deletions samba.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: samba
version: 4.20.4
version: 4.21.0
epoch: 0
description: "Tools to access a server's filespace and printers via SMB"
copyright:
Expand Down Expand Up @@ -30,6 +30,7 @@ environment:
- libtirpc-dev
- liburing-dev
- linux-pam-dev
- lmdb-dev
- ncurses-dev
- ncurses-terminfo
- ncurses-terminfo-base
Expand Down Expand Up @@ -60,13 +61,9 @@ environment:
pipeline:
- uses: fetch
with:
expected-sha256: 3a92e97eaeb345b6b32232f503e14d34f03a7aa64c451fe8c258a11bbda908e5
expected-sha256: 09bb56db4ce003cafdbebe9bad368c4f4ff1945f732d18077d52f36ab20cef88
uri: https://download.samba.org/pub/samba/stable/samba-${{package.version}}.tar.gz

- uses: patch
with:
patches: tinfo.patch

- uses: autoconf/configure
with:
opts: |
Expand All @@ -80,15 +77,19 @@ pipeline:
--with-piddir=/run/${{package.name}} \
--with-logfilebase=/var/log/${{package.name}} \
--with-pam \
--with-pammodulesdir=/usr/lib/security \
--without-systemd \
--with-ads \
--with-acl-support \
--with-ldap \
--with-shared-modules="$IDMAP_MODULES,$PDB_MODULES,$AUTH_MODULES,vfs_io_uring" \
--enable-cups \
--without-gettext \
--bundled-libraries=NONE,ntdb,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,cmocka \
--disable-rpath-install \
--without-gpgme \
--disable-fault-handling \
--without-smb1-server \
--without-regedit
- uses: autoconf/make
Expand Down Expand Up @@ -223,9 +224,9 @@ subpackages:
pipeline:
- runs: |
mkdir -p "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libdcerpc-samba4-private-samba.so "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/samba/libidmap-private-samba.so "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/samba/libnss-info-private-samba.so "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/samba/libdcerpc-samba4-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libidmap-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libnss-info-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
- name: winbind
description: Samba user and group resolver
Expand Down Expand Up @@ -444,7 +445,6 @@ subpackages:
mv "${{targets.destdir}}"/usr/lib/samba/libtalloc-report-printf-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libtalloc-report-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libtdb-wrap-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libtrusts-util-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libutil-reg-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libutil-setid-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
mv "${{targets.destdir}}"/usr/lib/samba/libutil-tdb-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
Expand All @@ -454,14 +454,10 @@ subpackages:
mv "${{targets.destdir}}"/usr/lib/libndr-nbt.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libndr-standard.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libndr.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libsamba-credentials.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libsamba-errors.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libsamba-hostconfig.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libsamba-passdb.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libsamdb.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libsmbconf.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libsmbldap.so.* "${{targets.contextdir}}"/usr/lib
mv "${{targets.destdir}}"/usr/lib/libtevent-util.so.* "${{targets.contextdir}}"/usr/lib
update:
enabled: true
Expand Down
11 changes: 0 additions & 11 deletions samba/tinfo.patch

This file was deleted.

0 comments on commit 6b86721

Please sign in to comment.