From a979ebe49b3c40736621f535339aa1b8297c125d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 25 Aug 2020 08:47:16 +0200 Subject: [PATCH 1/3] samba: add musl-legacy-compat for libc == musl croc: update to 8.1.2. --- srcpkgs/samba/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 28cbf44c0b9..e4ccd9f083c 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -27,6 +27,10 @@ hostmakedepends="pkg-config perl python-devel" makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel mit-krb5-devel libldap-devel pam-devel acl-devel avahi-libs-devel tdb-devel talloc-devel cups-devel" +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-legacy-compat" +fi + do_configure() { sed -e 's,XFS_QUOTA_,FS_QUOTA_,g' -i lib/sysquotas_xfs.c From bdd462ba83910667534650a9fe1b01fd00af45b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Thu, 27 Aug 2020 06:07:27 +0200 Subject: [PATCH 2/3] croc: update to 8.1.2. --- srcpkgs/croc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template index 07f957a0e41..27a96f596ae 100644 --- a/srcpkgs/croc/template +++ b/srcpkgs/croc/template @@ -1,6 +1,6 @@ # Template file for 'croc' pkgname=croc -version=8.0.13 +version=8.1.0 revision=1 build_style=go go_import_path=github.com/schollz/croc/v${version%%.*} @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/schollz/croc" distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz" -checksum=70c1da21037afb33b2debd6ac44f39f619e65f636ce3dcecf58030292a9c78e9 +checksum=b00328fde744a1d54240c85769b0554dc9a2fa695587bc96aa80bc9460705d57 post_install() { vlicense LICENSE From 7bca895ed98a94df502603ae93af92fa33767e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Sat, 29 Aug 2020 15:59:00 +0000 Subject: [PATCH 3/3] Delete template --- srcpkgs/samba/template | 137 ----------------------------------------- 1 file changed, 137 deletions(-) delete mode 100644 srcpkgs/samba/template diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template deleted file mode 100644 index e4ccd9f083c..00000000000 --- a/srcpkgs/samba/template +++ /dev/null @@ -1,137 +0,0 @@ -# Template file for 'samba' -pkgname=samba -version=3.6.25 -revision=14 -build_wrksrc=source3 -build_style=gnu-configure -configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap - --with-configdir=/etc/samba --with-lockdir=/var/samba --with-static-libs=libtevent - --with-cachedir=/var/samba --with-nmbdsocketdir=/run/samba/socket - --with-statedir=/var/samba --with-piddir=/run/samba --with-dnsupdate - --with-pammodulesdir=/usr/lib/security --with-automount --disable-swat - --with-syslog --enable-external-libtalloc --with-quotas --enable-cups - --enable-external-libtdb --disable-fam --with-ads --with-acl-support - --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 - --sbindir=/usr/bin" -short_desc="SMB/CIFS file, print, and login server for Unix" -maintainer="Orphaned " -license="GPL-3" -homepage="http://www.samba.org" -distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz" -checksum=8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 - -lib32disabled=yes -conf_files="/etc/pam.d/samba /etc/samba/smb.conf" -make_dirs="/etc/samba/private 0750 root root" -hostmakedepends="pkg-config perl python-devel" -makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel mit-krb5-devel - libldap-devel pam-devel acl-devel avahi-libs-devel tdb-devel talloc-devel cups-devel" - -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" musl-legacy-compat" -fi - -do_configure() { - sed -e 's,XFS_QUOTA_,FS_QUOTA_,g' -i lib/sysquotas_xfs.c - - if [ "$CROSS_BUILD" ]; then - configure_args+=" samba_cv_CC_NEGATIVE_ENUM_VALUES=yes - libreplace_cv_HAVE_GETADDRINFO=no - libreplace_cv_HAVE_GETIFADDRS=yes - ac_cv_file__proc_sys_kernel_core_pattern=yes - ac_cv_func_ext_krb5_free_keytab_entry_contents=yes - samba_cv_HAVE_WRFILE_KEYTAB=yes - smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes - smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes" - fi - # Disable quotas, broken with musl (needs rpc). - ./configure ${configure_args} --without-quotas -} -post_install() { - cd ${wrksrc} - # conf file - cat examples/smb.conf.default | \ - sed 's|log file = .*$|log file = /var/log/samba/%m.log|g' > \ - ${DESTDIR}/etc/samba/smb.conf - - # fix logrotate - sed -i -e 's|log.%m|%m.log|g' ${DESTDIR}/etc/samba/smb.conf - - # fix spool directory - sed -i 's|/usr/spool/samba|/var/spool/samba|g' \ - ${DESTDIR}/etc/samba/smb.conf - - # nsswitch libraries - vinstall nsswitch/libnss_wins.so 755 usr/lib - ln -s libnss_wins.so ${DESTDIR}/usr/lib/libnss_wins.so.2 - - vinstall nsswitch/libnss_winbind.so 755 usr/lib - ln -s libnss_winbind.so ${DESTDIR}/usr/lib/libnss_winbind.so.2 - - # winbind krb5 locator - vinstall source3/bin/winbind_krb5_locator.so 755 \ - usr/lib/krb5/plugins/libkrb5 - - # Remove unused manpages - rm -f ${DESTDIR}/usr/share/man/man8/tdb* - rm -f ${DESTDIR}/usr/share/man/man8/swat* - rm -f ${DESTDIR}/usr/lib/libtevent* - rm -f ${DESTDIR}/usr/include/samba/tevent* - - vsv nmbd - vsv smbd - - # PAM support - vinstall ${FILESDIR}/samba.pam 644 etc/pam.d samba - - # Install pkg-config files. - vmkdir usr/lib/pkgconfig - install -m644 source3/pkgconfig/*.pc ${DESTDIR}/usr/lib/pkgconfig - - # Link cups backend - vmkdir usr/lib/cups/backend - ln -s /usr/bin/smbspool ${DESTDIR}/usr/lib/cups/backend/smb -} - -smbclient_package() { - short_desc="Command-line SMB/CIFS clients for Unix" - pkg_install() { - vmove usr/share/man/man1 - - # Determine which binaries are client and which are server - # by looking at manpage suffix, and vmove the client - # binaries. Ugly. - for f in "$PKGDESTDIR"/usr/share/man/man1/*.1; do - g=$(basename "${f}" .1) - if [ -e "${DESTDIR}/usr/bin/${g}" ]; then - vmove usr/bin/${g} - fi - done - } -} -libsmbclient_package() { - short_desc="Shared libraries for communication with SMB/CIFS servers" - pkg_install() { - vmove "usr/lib/libwbclient.so.*" - vmove "usr/lib/libsmbclient.so.*" - vmove usr/share/man/man7/libsmbclient.7 - } -} -samba-devel_package() { - depends="libsmbclient>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/libwbclient.so - vmove usr/lib/libsmbclient.so - } -} - -samba-cups_package() { - depends="${sourcepkg}-${version}_${revision}" - short_desc="SMB backend for cups" - pkg_install() { - vmove usr/lib/cups/backend/smb - } -}