From 52a41475b9c56d2ef1ede26a7676d8985b6f5ad8 Mon Sep 17 00:00:00 2001 From: Cassandra Watergate <55339220+saltedcoffii@users.noreply.github.com> Date: Thu, 31 Mar 2022 18:59:19 -0700 Subject: [PATCH] smbclient => 4.16.0 and tdb => 1.4.6, talloc => 2.3.3, tevent => 0.11.0, ldb => 2.5.0, add perl_json package (#6580) * smbclient => 4.15.3 * Update tdb -> 1.4.5 * bump samba version * tdb -> 1.4.6 * add talloc update * add tevent update * add ldb update * fix tdb deps * Add perl_json dep to smbclient * update deps for smbclient * adjust deps for smbclient * add some builds (i686,armv7l still pending) * disable python in samba build * Add all binaries. Co-authored-by: Satadru Pramanik --- packages/ldb.rb | 25 ++++++++---------- packages/perl_json.rb | 40 +++++++++++++++++++++++++++++ packages/smbclient.rb | 59 ++++++++++++++++++++++--------------------- packages/talloc.rb | 26 ++++++++----------- packages/tdb.rb | 29 ++++++++++----------- packages/tevent.rb | 27 +++++++++----------- 6 files changed, 117 insertions(+), 89 deletions(-) create mode 100644 packages/perl_json.rb diff --git a/packages/ldb.rb b/packages/ldb.rb index 55f563cdb..08a9128ab 100644 --- a/packages/ldb.rb +++ b/packages/ldb.rb @@ -6,23 +6,23 @@ require 'package' class Ldb < Package description 'Schema-less, ldap like, API and database' homepage 'https://ldb.samba.org/' - version '2.3.0' + version '2.5.0' license 'GPLv3' compatibility 'all' source_url "https://samba.org/ftp/ldb/ldb-#{version}.tar.gz" - source_sha256 'a4d308b3d0922ef01f3661a69ebc373e772374defa76cf0979ad21b21f91922d' + source_sha256 '583ec548fc9cac4596dcd8b510408cdda2a8f85c02e672d0f9dce6a7364faa5e' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.3.0_armv7l/ldb-2.3.0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.3.0_armv7l/ldb-2.3.0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.3.0_i686/ldb-2.3.0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.3.0_x86_64/ldb-2.3.0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.5.0_armv7l/ldb-2.5.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.5.0_armv7l/ldb-2.5.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.5.0_i686/ldb-2.5.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ldb/2.5.0_x86_64/ldb-2.5.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'a21f075d2ecc39ccb53e97433c4cdbe3474054f773ea31735c9ef1227e05ae9e', - armv7l: 'a21f075d2ecc39ccb53e97433c4cdbe3474054f773ea31735c9ef1227e05ae9e', - i686: '4f4e782aa74c6ff93f20c0ab13858ea295094e547169336ec3d0cc34e6e1b3d2', - x86_64: '509439aae3a82f99825414bac49b704d6fec0f95c67e8b2532001e011ce2d288' + aarch64: 'c07b01c496e6ec532e654ca9d7f22aeca3d8ef79645ada44fd6457b4a64f4bb7', + armv7l: 'c07b01c496e6ec532e654ca9d7f22aeca3d8ef79645ada44fd6457b4a64f4bb7', + i686: 'd0de89fd2485e5963f9ee7f0626c2057fc8b52685003963ab75ce43f4c06d08b', + x86_64: '5e714041f50e093916d5ec22760b40342dee7340ddd75cf3f0952dcc3e6e03ad' }) depends_on 'cmocka' => :build @@ -36,10 +36,7 @@ class Ldb < Package depends_on 'tevent' def self.build - system "env CFLAGS='-flto=auto' \ - CXXFLAGS='-pipe -flto=auto' \ - LDFLAGS='-flto=auto' \ - ./configure \ + system "./configure \ #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ --localstatedir=#{CREW_PREFIX}/var \ --sysconfdir=#{CREW_PREFIX}/etc/samba \ diff --git a/packages/perl_json.rb b/packages/perl_json.rb new file mode 100644 index 000000000..2d2b9f41f --- /dev/null +++ b/packages/perl_json.rb @@ -0,0 +1,40 @@ +# Adapted from Arch Linux perl-json PKGBUILD at: +# https://github.com/archlinux/svntogit-community/raw/packages/perl-json/trunk/PKGBUILD + +require 'package' + +class Perl_json < Package + description 'JSON JavaScript Object Notation encoder/decoder' + homepage 'https://search.cpan.org/dist/JSON' + version '4.05' + license 'GPL PerlArtistic' + compatibility 'all' + source_url 'https://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/JSON-4.05.tar.gz' + source_sha256 '53839373210bebea0b24fe459d0a8232446b62015c8dc42dc36051da67336bf0' + + binary_url({ + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/perl_json/4.05_armv7l/perl_json-4.05-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/perl_json/4.05_armv7l/perl_json-4.05-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/perl_json/4.05_i686/perl_json-4.05-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/perl_json/4.05_x86_64/perl_json-4.05-chromeos-x86_64.tar.zst' + }) + binary_sha256({ + aarch64: '30e90a27223c850822f6f738d491091b3caf2b472bf07e57927736bf24f16d70', + armv7l: '30e90a27223c850822f6f738d491091b3caf2b472bf07e57927736bf24f16d70', + i686: 'd338da27af6830628bfa65922d6a608e87430f1bab7a055a926b0d6edb47bbb5', + x86_64: '87cde104a0c49bea5dee8dbda9faef3a00354a5fe5f0d0233d3e25e2eb18b47a' + }) + + def self.prebuild + system 'perl', 'Makefile.PL' + system "sed -i 's,/usr/local,#{CREW_PREFIX},g' Makefile" + end + + def self.build + system 'make' + end + + def self.install + system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + end +end diff --git a/packages/smbclient.rb b/packages/smbclient.rb index 31fa95cb9..7f4b01ea4 100644 --- a/packages/smbclient.rb +++ b/packages/smbclient.rb @@ -3,45 +3,46 @@ require 'package' class Smbclient < Package description 'Tools to access a servers filespace and printers via SMB' homepage 'https://www.samba.org' - version '4.14.4' + version '4.16.0' license 'GPLv3' compatibility 'all' - source_url "https://us1.samba.org/samba/ftp/stable/samba-#{version}.tar.gz" - source_sha256 '89af092a0b00f5354ed287f0aa37b8c2cf9ba2ce67ea6464192e2c18528f89b9' + source_url 'https://download.samba.org/pub/samba/stable/samba-4.16.0.tar.gz' + source_sha256 '97c47de35915d1637b254f02643c3230c3e73617851700edc7a2a8c958a3310c' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.14.4_armv7l/smbclient-4.14.4-chromeos-armv7l.tpxz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.14.4_armv7l/smbclient-4.14.4-chromeos-armv7l.tpxz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.14.4_i686/smbclient-4.14.4-chromeos-i686.tpxz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.14.4_x86_64/smbclient-4.14.4-chromeos-x86_64.tpxz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.16.0_armv7l/smbclient-4.16.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.16.0_armv7l/smbclient-4.16.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.16.0_i686/smbclient-4.16.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/smbclient/4.16.0_x86_64/smbclient-4.16.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '22d24a7a51efc97853ed1b7b110a84b099efd7b465dbf46194a406fc9af6b8d5', - armv7l: '22d24a7a51efc97853ed1b7b110a84b099efd7b465dbf46194a406fc9af6b8d5', - i686: '2e50aa2792825d119143bd9cbeae10d167623d2ffee50f4e4b7d64ff69251b7e', - x86_64: '8f0f6e9e37d39b8893034af1e019bcf4c1c4fcf0c689edbb37da967658c7c1f4' + aarch64: '984271933e93cff22899d51494abceccce92aa98b94d040ed7f8159ae890ef2a', + armv7l: '984271933e93cff22899d51494abceccce92aa98b94d040ed7f8159ae890ef2a', + i686: '050592f2bab1c417a23b1d6571330e97ac644d0dceadbbcffd0cca5c71b434db', + x86_64: 'cf2a5478cec8d024f85dc5fdf22bd802d0c99afbb231157fad47370bcc8d73e4' }) - depends_on 'avahi' - depends_on 'cmocka' - depends_on 'cups' - depends_on 'docbook_xsl' + depends_on 'avahi' # R + depends_on 'cmocka' => :build + depends_on 'cups' => :build + depends_on 'docbook_xsl' => :build depends_on 'gpgme' => :build - depends_on 'jansson' - depends_on 'ldb' - depends_on 'libbsd' - depends_on 'libcap' - depends_on 'libunwind' + depends_on 'jansson' => :build + depends_on 'ldb' # R + depends_on 'libbsd' # R + depends_on 'libcap' # R + depends_on 'libunwind' # R depends_on 'liburing' => :build - depends_on 'linux_pam' + depends_on 'linux_pam' # R depends_on 'lmdb' => :build + depends_on 'perl_json' => :build depends_on 'perl_parse_yapp' => :build - depends_on 'popt' - depends_on 'py3_markdown' - depends_on 'py3_dnspython' - depends_on 'talloc' - depends_on 'tdb' - depends_on 'tevent' + depends_on 'popt' => :build + depends_on 'py3_dnspython' => :build + depends_on 'py3_markdown' => :build + depends_on 'talloc' # R + depends_on 'tdb' # R + depends_on 'tevent' # R @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' @@ -62,8 +63,7 @@ class Smbclient < Package def self.build system './configure --help' - system "env #{CREW_ENV_OPTIONS} - ./configure --enable-fhs \ + system "python_LDFLAGS='' ./configure --enable-fhs \ #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ --sysconfdir=#{CREW_PREFIX}/etc \ --sbindir=#{CREW_PREFIX}/bin \ @@ -74,6 +74,7 @@ class Smbclient < Package --with-lockdir=#{CREW_PREFIX}/var/cache/samba \ --builtin-libraries=NONE \ --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util,NONE \ + --disable-python \ --disable-rpath \ --disable-rpath-install \ --with-acl-support \ diff --git a/packages/talloc.rb b/packages/talloc.rb index 3874f4129..95567517e 100644 --- a/packages/talloc.rb +++ b/packages/talloc.rb @@ -6,23 +6,23 @@ require 'package' class Talloc < Package description 'Hierarchical pool based memory allocator with destructors' homepage 'https://talloc.samba.org/' - version '2.3.2' + version '2.3.3' license 'LGPL' compatibility 'all' source_url "https://www.samba.org/ftp/talloc/talloc-#{version}.tar.gz" - source_sha256 '27a03ef99e384d779124df755deb229cd1761f945eca6d200e8cfd9bf5297bd7' + source_sha256 '6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.2_armv7l/talloc-2.3.2-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.2_armv7l/talloc-2.3.2-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.2_i686/talloc-2.3.2-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.2_x86_64/talloc-2.3.2-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.3_armv7l/talloc-2.3.3-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.3_armv7l/talloc-2.3.3-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.3_i686/talloc-2.3.3-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/talloc/2.3.3_x86_64/talloc-2.3.3-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '34e7e59fdd8ab619eb0a24aec3011093653399502038b7071395006dcf6e3b08', - armv7l: '34e7e59fdd8ab619eb0a24aec3011093653399502038b7071395006dcf6e3b08', - i686: 'f2b0b683234c60440ac6c53773aa8f38297ac8548c1a509773fa5bae836fbf47', - x86_64: '0b22a9f1ce28259ba8d4fd046d00677c6b2590f2a0951a004d1f9d6173e592b6' + aarch64: 'a723d57e1400894c112f6480effb852195b9d1edd56ca6692b42747d56af0b80', + armv7l: 'a723d57e1400894c112f6480effb852195b9d1edd56ca6692b42747d56af0b80', + i686: 'c8c43903f11e03ef117f72e3ddf9d4fe4f5ffe1e800f9789001fb049d51c480a', + x86_64: '983230c12d39e40265a18aebd25440bd6561d7cc09327622555c4674df438d8c' }) depends_on 'libbsd' @@ -30,11 +30,7 @@ class Talloc < Package depends_on 'docbook_xsl' => :build def self.build - system "env CFLAGS='-flto=auto' \ - CXXFLAGS='-pipe -flto=auto' \ - LDFLAGS='-flto=auto' \ - ./configure \ - #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ + system "./configure #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ --sysconfdir=#{CREW_PREFIX}/etc/samba \ --localstatedir=#{CREW_PREFIX}/var \ --bundled-libraries=NONE \ diff --git a/packages/tdb.rb b/packages/tdb.rb index 897bae97f..030c582d2 100644 --- a/packages/tdb.rb +++ b/packages/tdb.rb @@ -3,34 +3,31 @@ require 'package' class Tdb < Package description 'tdb is a simple database API for sharing structures between parts of Samba' homepage 'https://tdb.samba.org/' - version '1.4.3' + version '1.4.6' license 'GPL-3' compatibility 'all' source_url "https://www.samba.org/ftp/tdb/tdb-#{version}.tar.gz" - source_sha256 'c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b' + source_sha256 'd6892bd8befe04a77642a1dd56e4a879349bf1cf5b2c0bf5fb841061938def0b' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.3_armv7l/tdb-1.4.3-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.3_armv7l/tdb-1.4.3-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.3_i686/tdb-1.4.3-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.3_x86_64/tdb-1.4.3-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.6_armv7l/tdb-1.4.6-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.6_armv7l/tdb-1.4.6-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.6_i686/tdb-1.4.6-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tdb/1.4.6_x86_64/tdb-1.4.6-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '658452e796dffb16b9cc074f47bee90e5155cca0888f444cb13b716b577c5e60', - armv7l: '658452e796dffb16b9cc074f47bee90e5155cca0888f444cb13b716b577c5e60', - i686: '22c959f77a28a1b13d2603557b4d87b454dd04099682ba7a749ad99b7a945a43', - x86_64: '0040f43e9214ce035ca1eefca7923fce12aa8bc8710de383ca142c0eaaf12a9e' + aarch64: '8396dd401979dd2865079e3b4b14b36026f1b9d74f0a555fa382355f9eca3dc6', + armv7l: '8396dd401979dd2865079e3b4b14b36026f1b9d74f0a555fa382355f9eca3dc6', + i686: '37f60900b780ddeda64dd2dd0d9739266a0f27ef6ebbb9b6079dd1dccc3099df', + x86_64: 'd3e0bf820e71c2a0c6a8630eb215b41049a6595619b0bcc679e615581d6d9904' }) - depends_on 'docbook_xsl' + depends_on 'docbook_xsl' => :build depends_on 'libbsd' - depends_on 'libxslt' + depends_on 'libxslt' => :build def self.build - system "env CFLAGS='-flto=auto' \ - CXXFLAGS='-pipe -flto=auto' \ - LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS.sub(/--program-suffix.*/, '')}" + system "./configure #{CREW_OPTIONS.sub(/--program-suffix.*/, '')}" system 'make' end diff --git a/packages/tevent.rb b/packages/tevent.rb index 53df2c159..c5ffaa618 100644 --- a/packages/tevent.rb +++ b/packages/tevent.rb @@ -6,35 +6,32 @@ require 'package' class Tevent < Package description 'Event system based on the talloc memory management library' homepage 'https://tevent.samba.org/' - version '0.10.2' + version '0.11.0' license 'LGPL' compatibility 'all' source_url "https://samba.org/ftp/tevent/tevent-#{version}.tar.gz" - source_sha256 'f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696' + source_sha256 'ee9a86c8e808aac2fe1e924eaa139ff7f0269d0e8e4fafa850ae5c7489bc82ba' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.10.2_armv7l/tevent-0.10.2-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.10.2_armv7l/tevent-0.10.2-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.10.2_i686/tevent-0.10.2-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.10.2_x86_64/tevent-0.10.2-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.11.0_armv7l/tevent-0.11.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.11.0_armv7l/tevent-0.11.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.11.0_i686/tevent-0.11.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tevent/0.11.0_x86_64/tevent-0.11.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '2a34abbf8f8619fec618d0f08e692d61065c8fcc5ef37cf7a1bf64415709ea4f', - armv7l: '2a34abbf8f8619fec618d0f08e692d61065c8fcc5ef37cf7a1bf64415709ea4f', - i686: '112a2a38a8be799e12f6de9691607f4de08e2a6da39359dd37470fb0456d8788', - x86_64: 'd7a762d732c98a074eabfc1367e7ce0330511a8713a4cea36c262d62c31c89f0' + aarch64: '9a72a1bbba9fdb0d298b91b687f2457b216d4b961649d1f8dbacd75a5b1e96ab', + armv7l: '9a72a1bbba9fdb0d298b91b687f2457b216d4b961649d1f8dbacd75a5b1e96ab', + i686: 'd1d1947c895da8b5aad1fe8241de4e20d7d5f176adc0b9803151eb426615ed4f', + x86_64: '3939c1757d7eded3e66c70ba63a00c6cd37390bd1e1ac02da00a33916f13f0af' }) depends_on 'libbsd' depends_on 'libxcrypt' depends_on 'talloc' + depends_on 'cmocka' => :build def self.build - system "env CFLAGS='-flto=auto' \ - CXXFLAGS='-pipe -flto=auto' \ - LDFLAGS='-flto=auto' \ - ./configure \ - #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ + system "./configure #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ --sysconfdir=#{CREW_PREFIX}/etc/samba \ --localstatedir=#{CREW_PREFIX}/var \ --bundled-libraries=NONE \