Date: Thursday, November 28, 2019 @ 21:41:08 Author: arojas Revision: 369887
Fix quoting and remove non-existant files from backup Modified: samba/trunk/PKGBUILD ----------+ PKGBUILD | 119 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 58 insertions(+), 61 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-28 21:26:27 UTC (rev 369886) +++ PKGBUILD 2019-11-28 21:41:08 UTC (rev 369887) @@ -25,6 +25,11 @@ samba.pam samba.conf) validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution Verification Key <samba-b...@samba.org> +md5sums=('8f4fb25c13be88f23b4eebe8715ba3c1' + 'SKIP' + '995621522c6ec9b68c1b858ceed627ed' + '96f82c38f3f540b53f3e5144900acf17' + '49abd7b719e3713a3f75a8a50958e381') ### UNINSTALL dmapi package before building!!! build() { @@ -31,13 +36,12 @@ # Use samba-pkg as a staging directory for the split packages # (This is so RPATHS and symlinks are generated correctly via # make install, but the otherwise unsplit pieces can be split) - _pkgsrc=${srcdir}/samba-pkg + _pkgsrc="${srcdir}"/samba-pkg rm -rf ${_pkgsrc} - cd ${srcdir}/samba-${pkgver} _samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 _samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 - cd ${srcdir}/samba-${pkgver} + cd samba-${pkgver} ./configure --enable-fhs \ --prefix=/usr \ --sysconfdir=/etc \ @@ -68,8 +72,8 @@ make DESTDIR="${_pkgsrc}/" install # This gets skipped somehow - if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then - install -m755 ${srcdir}/samba-${pkgver}/source3/script/smbtar ${_pkgsrc}/usr/bin/ + if [ ! -e "${_pkgsrc}"/usr/bin/smbtar ]; then + install -m755 "${srcdir}"/samba-${pkgver}/source3/script/smbtar "${_pkgsrc}"/usr/bin/ fi } @@ -79,19 +83,19 @@ # Use samba-pkg as a staging directory for the split packages # (This is so RPATHS and symlinks are generated correctly via # make install, but the otherwise unsplit pieces can be split) - _pkgsrc=${srcdir}/samba-pkg - install -d -m755 ${pkgdir}/usr/lib - mv ${_pkgsrc}/usr/lib/libwbclient*.so* ${pkgdir}/usr/lib/ + _pkgsrc="${srcdir}"/samba-pkg + install -d -m755 "${pkgdir}"/usr/lib + mv "${_pkgsrc}"/usr/lib/libwbclient*.so* "${pkgdir}"/usr/lib/ - install -d -m755 ${pkgdir}/usr/lib/samba - mv ${_pkgsrc}/usr/lib/samba/libwinbind-client*.so* ${pkgdir}/usr/lib/samba/ - mv ${_pkgsrc}/usr/lib/samba/libreplace-samba4.so* ${pkgdir}/usr/lib/samba/ + install -d -m755 "${pkgdir}"/usr/lib/samba + mv "${_pkgsrc}"/usr/lib/samba/libwinbind-client*.so* "${pkgdir}"/usr/lib/samba/ + mv "${_pkgsrc}"/usr/lib/samba/libreplace-samba4.so* "${pkgdir}"/usr/lib/samba/ - install -d -m755 ${pkgdir}/usr/lib/pkgconfig - mv ${_pkgsrc}/usr/lib/pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + install -d -m755 "${pkgdir}"/usr/lib/pkgconfig + mv "${_pkgsrc}"/usr/lib/pkgconfig/wbclient.pc "${pkgdir}"/usr/lib/pkgconfig/ - install -d -m755 ${pkgdir}/usr/include/samba-4.0 - mv ${_pkgsrc}/usr/include/samba-4.0/wbclient.h ${pkgdir}/usr/include/samba-4.0/ + install -d -m755 "${pkgdir}"/usr/include/samba-4.0 + mv "${_pkgsrc}"/usr/include/samba-4.0/wbclient.h "${pkgdir}"/usr/include/samba-4.0/ } package_smbclient() { @@ -106,48 +110,48 @@ # Use samba-pkg as a staging directory for the split packages # (This is so RPATHS and symlinks are generated correctly via # make install, but the otherwise unsplit pieces can be split) - _pkgsrc=${srcdir}/samba-pkg - install -d -m755 ${pkgdir}/usr/bin + _pkgsrc="${srcdir}"/samba-pkg + install -d -m755 "${pkgdir}"/usr/bin for bin in ${_smbclient_bins[@]}; do - mv ${_pkgsrc}/usr/bin/${bin} ${pkgdir}/usr/bin/ + mv "${_pkgsrc}"/usr/bin/${bin} "${pkgdir}"/usr/bin/ done # smbclient binaries link to the majority of the samba # libs, so this is a shortcut instead of resolving the # whole dependency tree by hand - install -d -m755 ${pkgdir}/usr/lib - for lib in ${_pkgsrc}/usr/lib/lib*.so*; do - mv ${lib} ${pkgdir}/usr/lib/ + install -d -m755 "${pkgdir}"/usr/lib + for lib in "${_pkgsrc}"/usr/lib/lib*.so*; do + mv ${lib} "${pkgdir}"/usr/lib/ done - install -d -m755 ${pkgdir}/usr/lib/samba - for lib in ${_pkgsrc}/usr/lib/samba/lib*.so*; do - mv ${lib} ${pkgdir}/usr/lib/samba/ + install -d -m755 "${pkgdir}"/usr/lib/samba + for lib in "${_pkgsrc}"/usr/lib/samba/lib*.so*; do + mv ${lib} "${pkgdir}"/usr/lib/samba/ done - install -d -m755 ${pkgdir}/usr/lib/pkgconfig - mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ - mv ${_pkgsrc}/usr/lib/pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ + install -d -m755 "${pkgdir}"/usr/lib/pkgconfig + mv "${_pkgsrc}"/usr/lib/pkgconfig/smbclient.pc "${pkgdir}"/usr/lib/pkgconfig/ + mv "${_pkgsrc}"/usr/lib/pkgconfig/netapi.pc "${pkgdir}"/usr/lib/pkgconfig/ - install -d -m755 ${pkgdir}/usr/share/man/man1 - install -d -m755 ${pkgdir}/usr/share/man/man7 - install -d -m755 ${pkgdir}/usr/share/man/man8 + install -d -m755 "${pkgdir}"/usr/share/man/man1 + install -d -m755 "${pkgdir}"/usr/share/man/man7 + install -d -m755 "${pkgdir}"/usr/share/man/man8 for bin in ${_smbclient_bins[@]}; do - if [ -e ${_pkgsrc}/usr/share/man/man1/${bin}.1 ]; then - mv ${_pkgsrc}/usr/share/man/man1/${bin}.1 ${pkgdir}/usr/share/man/man1/ + if [ -e "${_pkgsrc}"/usr/share/man/man1/${bin}.1 ]; then + mv "${_pkgsrc}"/usr/share/man/man1/${bin}.1 "${pkgdir}"/usr/share/man/man1/ fi - if [ -e ${_pkgsrc}/usr/share/man/man8/${bin}.8 ]; then - mv ${_pkgsrc}/usr/share/man/man8/${bin}.8 ${pkgdir}/usr/share/man/man8/ + if [ -e "${_pkgsrc}"/usr/share/man/man8/${bin}.8 ]; then + mv "${_pkgsrc}"/usr/share/man/man8/${bin}.8 "${pkgdir}"/usr/share/man/man8/ fi done - mv ${_pkgsrc}/usr/share/man/man7/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ + mv "${_pkgsrc}"/usr/share/man/man7/libsmbclient.7 "${pkgdir}"/usr/share/man/man7/ - install -d -m755 ${pkgdir}/usr/include/samba-4.0 - mv ${_pkgsrc}/usr/include/samba-4.0/libsmbclient.h ${pkgdir}/usr/include/samba-4.0/ - mv ${_pkgsrc}/usr/include/samba-4.0/netapi.h ${pkgdir}/usr/include/samba-4.0/ + install -d -m755 "${pkgdir}"/usr/include/samba-4.0 + mv "${_pkgsrc}"/usr/include/samba-4.0/libsmbclient.h "${pkgdir}"/usr/include/samba-4.0/ + mv "${_pkgsrc}"/usr/include/samba-4.0/netapi.h "${pkgdir}"/usr/include/samba-4.0/ - mkdir -p ${pkgdir}/usr/lib/cups/backend - ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb + mkdir -p "${pkgdir}"/usr/lib/cups/backend + ln -sf /usr/bin/smbspool "${pkgdir}"/usr/lib/cups/backend/smb } package_samba() { @@ -156,18 +160,16 @@ 'talloc' 'ldb' 'libbsd' 'python' 'iniparser' 'tdb' 'libaio' 'perl-parse-yapp' "smbclient>=$pkgver" 'gpgme') backup=(etc/logrotate.d/samba etc/pam.d/samba - etc/samba/smb.conf - etc/xinetd.d/swat etc/conf.d/samba) install=samba.install # Use samba-pkg as a staging directory for the split packages # (This is so RPATHS and symlinks are generated correctly via # make install, but the otherwise unsplit pieces can be split) - _pkgsrc=${srcdir}/samba-pkg + _pkgsrc="${srcdir}"/samba-pkg # Everything that libwbclient and smbclient didn't install goes # into the samba package... - mv ${_pkgsrc}/* ${pkgdir}/ - rmdir ${_pkgsrc} + mv "${_pkgsrc}"/* "${pkgdir}" + rmdir "${_pkgsrc}" # Make admin scripts look in the right place for the samba python module for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \ @@ -175,7 +177,7 @@ do sed -i "/^sys\.path\.insert/ a\ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ - ${pkgdir}/usr/${script} + "${pkgdir}"/usr/${script} done # packaging/wscript_build to use /etc/conf.d @@ -184,27 +186,22 @@ install -m644 "${srcdir}"/samba-${pkgver}/packaging/systemd/samba.sysconfig "${pkgdir}"/etc/conf.d/samba # create ephemeral dirs via tmpfiles rather than shipping them in package - install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf + install -D -m644 "${srcdir}"/samba.conf "${pkgdir}"/usr/lib/tmpfiles.d/samba.conf # create config dir - install -d -m755 ${pkgdir}/etc/samba + install -d -m755 "${pkgdir}"/etc/samba - mkdir -p ${pkgdir}/etc/samba/private - chmod 700 ${pkgdir}/etc/samba/private + mkdir -p "${pkgdir}"/etc/samba/private + chmod 700 "${pkgdir}"/etc/samba/private - install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba + install -D -m644 "${srcdir}"/samba.logrotate "${pkgdir}"/etc/logrotate.d/samba + install -D -m644 "${srcdir}"/samba.pam "${pkgdir}"/etc/pam.d/samba # spool directory - install -d -m1777 ${pkgdir}/var/spool/samba + install -d -m1777 "${pkgdir}"/var/spool/samba - rm -rf ${pkgdir}/var/run - rm -rf ${pkgdir}/etc/sysconfig + rm -rf "${pkgdir}"/var/run + rm -rf "${pkgdir}"/etc/sysconfig # copy ldap example - install -D -m644 ${srcdir}/samba-${pkgver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema + install -D -m644 "${srcdir}"/samba-${pkgver}/examples/LDAP/samba.schema "${pkgdir}"/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('8f4fb25c13be88f23b4eebe8715ba3c1' - 'SKIP' - '995621522c6ec9b68c1b858ceed627ed' - '96f82c38f3f540b53f3e5144900acf17' - '49abd7b719e3713a3f75a8a50958e381')