Fixed CFLAGS in extra/{feh,v4l-utils} and gtk/libunique

Upgraded net/samba to 4.18.0
Discarded doinst.sh from extra/{mpv,v4l-utils} and gtk/{gcr,goffice,gsettings-desktop-schemas}
Discarded gtk/gtk-sharp
Repositioned nand-utils source extraction code inside a subshell in extra/mtd-utils
Discarded code to remove tests in gtk/{atkmm,cairomm,libsoup}
Disabled tests in build option of gtk/{gdk-pixbuf,gtk3,libdazzle}
Fixed mkdir code in gtk/{gegl,gnome-desktop,gobject-introspection,libdazzle,libglade,libmanette} for aiding in resuming build
Rewrote gtk/gnome-icon-theme pc file in the build file itself
Fixed gtk/gtk2's doinst.sh
Disabled static libraries compile in gtk/openjpeg
Updated buildlist of net
Fixed net/privoxy build file

extra/adafruit-io/adafruit-io.SMBuild

@@ -17,6 +17,7 @@ prepbuilddir() {
 
 build() {
   python setup.py install --prefix="" --root=$pkg
+
   cp LICENSE* $pkgdocs/
 
   mkfinalpkg

extra/feh/feh.SMBuild

@@ -16,14 +16,9 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -D_GNU_SOURCE -include string.h" \
+  CFLAGS+=" -include string.h" \
-  make PREFIX="/" \
+  make PREFIX="/" exif=1 help=1
-  exif=1 help=1
+  make install DESTDIR=$pkg PREFIX="/" man_dir=$pkg/share/man 
-
-  make install DESTDIR=$pkg PREFIX="/" \
-   man_dir=$pkg/share/man \
-   doc_dir=$pkg/doc/$app-$version \
-   example_dir=$pkg/doc/$app-$version/examples
 
   cp COPYING $pkgdocs/
 

extra/heimdall/LINK

@@ -1 +0,0 @@
-https://glassechidna.com.au/heimdall/

extra/mpv/doinst.sh

@@ -1 +0,0 @@
-[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk

extra/mtd-utils/mtd-utils.SMBuild

@@ -13,6 +13,13 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+
+  (
+    tar xf $srcdir/nand-utils-$nandversion.tar.?z*
+    cd nand-utils-$nandversion
+    fixbuilddirpermissions
+  )
+  
 }
 
 build() {
@@ -25,14 +32,15 @@ build() {
   make install DESTDIR=$pkg 
 
   cp COPYING $pkgdocs/
+  
+  (
+    cd nand-utils-$nandversion
 
-  tar xf $srcdir/nand-utils-$nandversion.tar.?z*
+    make 
-  cd nand-utils-$nandversion
+    make install SBINDIR="/bin" MANDIR="/share/man" DESTDIR=$pkg
 
-  make 
+    cp COPYING $pkgdocs/COPYING.nand-utils
-  make install SBINDIR="/bin" MANDIR="/share/man" DESTDIR=$pkg
+  )
-
-  cp COPYING $pkgdocs/COPYING.nand-utils
 
   mkfinalpkg
 }

extra/sdl2/sdl2.SMBuild

@@ -22,8 +22,7 @@ build() {
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS="$CFLAGS" \
+    -DSDL_STATIC=OFF \
-    -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
     -DPULSEAUDIO=OFF 
 
   make

extra/v4l-utils/doinst.sh

@@ -1 +0,0 @@
-[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk

extra/v4l-utils/v4l-utils.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -D__off_t=off_t" \
+  CFLAGS+=" -D__off_t=off_t" \
   LIBS="-largp" \
   ./configure \
     --prefix="/" \

extra/vim/vim.SMBuild

@@ -28,7 +28,7 @@ build() {
   --enable-terminal
 
   make
-  make -j1 STRIP=true VIMRCLOC="$pkg"/etc install DESTDIR="$pkg" 
+  make -j1 VIMRCLOC="$pkg"/etc install DESTDIR="$pkg" 
 
   cp *.md $pkgdocs/
   

gtk/.buildlist.gtk

@@ -54,11 +54,10 @@ gspell
 gcr
 rest
 libunique
+pygobject3
 libgexiv2
 libgphoto2
 py3cairo
-pygobject3
 libmanette
 libportal
 libdazzle
-gtk-sharp

gtk/atk/atk.SMBuild

@@ -16,7 +16,7 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
-  meson .. --prefix="/" 
+  meson .. --prefix="/"
 
   ninja 
   DESTDIR="$pkg" ninja install

gtk/atkmm/atkmm.SMBuild

@@ -17,11 +17,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix="" \
-
+    --disable-documentation
-  for i in doc ; do 
-   printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile
-  done
 
   make
   make install DESTDIR=$pkg

gtk/cairomm/cairomm.SMBuild

@@ -17,11 +17,12 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix="" \
+    --disable-documentation
 
-  for i in tests docs examples ; do
+  #for i in tests docs examples ; do
-   printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile
+  # printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile
-  done
+  #done
 
   make
   make install DESTDIR=$pkg

gtk/gcr/doinst.sh

@@ -1 +0,0 @@
-[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk

gtk/gdk-pixbuf/gdk-pixbuf.SMBuild

@@ -19,7 +19,8 @@ build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/" \
-    -Dman=false 
+    -Dman=false \
+    -Dinstalled_tests=false
 
   ninja
   DESTDIR="$pkg" ninja install

gtk/gegl/gegl.SMBuild

@@ -18,12 +18,11 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/" \
     -Ddocs=false \
-    -Dvapigen=disabled \
+    -Dvapigen=disabled
-    -Dintrospection=false
 
   ninja
   DESTDIR="$pkg" ninja install

gtk/glib-networking/doinst.sh

@@ -1,4 +1,3 @@
 if [ -x /bin/gio-querymodules ]; then
   chroot . /bin/gio-querymodules /lib/gio/modules/ >/dev/null 2>&1
 fi
-

gtk/gnome-desktop/gnome-desktop.SMBuild

@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/" \
     -Dgnome_distributor="SMLinux" \

gtk/gnome-icon-theme/gnome-icon-theme.SMBuild

@@ -10,9 +10,24 @@ prepbuilddir() {
 }
 
 build() {
-  install -Dm 0644 $srcdir/gnome-icon-theme.pc $pkg/lib/pkgconfig/gnome-icon-theme.pc
 
-  mkfinalpkg
+  mkdir -p $pkg/lib/pkgconfig/
+
+  cat << EOF >> $pkg/lib/pkgconfig/gnome-icon-theme.pc
+prefix=
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Gnome Icon Theme
+Description:
+Requires: glib-2.0
+Version: 2.32.2
+Libs:
+Cflags:
+EOF
+
+mkfinalpkg
 }
 
 sha512sums="

gtk/gnome-icon-theme/gnome-icon-theme.pc

@@ -1,11 +0,0 @@
-prefix=
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Gnome Icon Theme
-Description:
-Requires: glib-2.0
-Version: 2.32.2
-Libs:
-Cflags:

gtk/gobject-introspection/gobject-introspection.SMBuild

@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/" \
     --buildtype=release

gtk/goffice/goffice.SMBuild

@@ -17,7 +17,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix=""
 
   for i in po ; do
    printf 'all:\n\ttrue\ninstall:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile

gtk/gsettings-desktop-schemas/doinst.sh

@@ -1 +0,0 @@
-[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk

gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild

@@ -13,12 +13,12 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+
+  sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in
 }
 
 build() {
-  sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in &&
+  mkdir -p smbuild && cd smbuild
-  mkdir smbuild && cd smbuild
-
   meson .. \
     --prefix="/"
 

gtk/gtk-sharp/fix-build.patch

@@ -1,46 +0,0 @@
-From a00552ad68ae349e89e440dca21b86dbd6bccd30 Mon Sep 17 00:00:00 2001
-From: Ankit Jain <radical@gmail.com>
-Date: Tue, 19 Feb 2019 23:53:27 -0500
-Subject: [PATCH] Fix build failure with mcs caused by C#8 changes in mcs
- (#263)
-
-Recent addition of C#8 features to mcs possibly broke this:
-
-```
-mcs -out:WidgetViewer.exe -r:../../glib/glib-sharp.dll -r:../../pango/pango-sharp.dll -r:../../atk/atk-sharp.dll -r:../../gdk/gdk-sharp.dll -r:../../gtk/gtk-sharp.dll ./TestCheckButton.cs ./TestColorSelection.cs ./TestRadioButton.cs ./TestRange.cs ./TestStatusbar.cs ./TestDialog.cs ./TestFlipping.cs ./TestSizeGroup.cs ./TestCombo.cs ./TestComboBox.cs ./WidgetViewer.cs
-./TestCombo.cs(17,14): warning CS0612: `Gtk.Combo' is obsolete
-./TestRange.cs(35,6): error CS0104: `Range' is an ambiguous reference between `System.Range' and `Gtk.Range'
-@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol related to previous error)
-@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll (Location of the symbol related to previous error)
-./TestRange.cs(35,13): error CS0030: Cannot convert type `Gtk.HScale' to `System.Range'
-./TestRange.cs(42,6): error CS0104: `Range' is an ambiguous reference between `System.Range' and `Gtk.Range'
-@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol related to previous error)
-@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll (Location of the symbol related to previous error)
-./TestRange.cs(42,13): error CS0030: Cannot convert type `Gtk.HScrollbar' to `System.Range'
-./TestRange.cs(62,6): error CS0104: `Range' is an ambiguous reference between `System.Range' and `Gtk.Range'
-@/external/bockbuild/stage/lib/mono/4.5/mscorlib.dll (Location of the symbol related to previous error)
-@/external/bockbuild/builds/gtk-sharp-None/sample/test/../../gtk/gtk-sharp.dll (Location of the symbol related to previous error)
-./TestRange.cs(62,13): error CS0030: Cannot convert type `Gtk.VScale' to `System.Range'
-```
-
-This is because the compiler is resolving `Range` in the test as `System.Range`
-instead of `Gtk.Range`, so we disambiguate it.
-
-/cc @marek-safar
----
- sample/test/TestRange.cs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs
-index 35fc8a6dd..d44a77d85 100644
---- a/sample/test/TestRange.cs
-+++ b/sample/test/TestRange.cs
-@@ -9,6 +9,8 @@
- using System;
- 
- using Gtk;
-+// disambiguate, Gtk.Range vs System.Range
-+using Range=Gtk.Range;
- 
- namespace WidgetViewer {
- 

gtk/gtk-sharp/gtk-sharp.SMBuild

@@ -1,34 +0,0 @@
-app=gtk-sharp
-version=2.99.3
-build=1sml
-homepage="https://www.mono-project.com/docs/gui/gtksharp/"
-download="https://download.gnome.org/sources/gtk-sharp/2.99/gtk-sharp-$version.tar.xz"
-desc="C# bindings for GTK3"
-requires="gtk3 mono"
-
-build() {
-  mkandenterbuilddir
-  rm -rf $app-$version
-
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
-  fixbuilddirpermissions
-
-  applypatch $srcdir/fix-build.patch
-
-  sed -i 's@gmcs@mcs@g' configure{,.ac}
-  sed -e '/MONO_PROFILE_ENTER_LEAVE/d' -i gtk/gui-thread-check/profiler/gui-thread-check.c 
-
-  ./configure \
-    --prefix="/" \
-    --disable-static
-
-  make
-  make install DESTDIR=$pkg
-
-  mkfinalpkg
-}
-sha512sums="
-91e3abd1550cf18ff56cdcdf4e44fd2d03e50243c0f5479410708004702b4bb2c23f097e363b29e68a1327b7e86470b1543fe5db812367276d32de808c110c4c  gtk-sharp-2.99.3.tar.lz
-7adf3566a9112040efa8628b8ee887e01dc05cf0b9a8470209b5cde72c6000c357310b7b005a0d3ccf6faa38ae46da34788eac71546c91c224dbec109cb99084  fix-build.patch
-"

gtk/gtk2/doinst.sh

@@ -12,5 +12,5 @@ config() {
 
 config etc/gtk-2.0/im-multipress.conf.new
 
-rm -f /share/icons/*/icon-theme.cache >/dev/null 2>&1
+rm -f share/icons/*/icon-theme.cache >/dev/null 2>&1
 [ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk

gtk/gtk3/gtk3.SMBuild

@@ -21,7 +21,8 @@ build() {
     --prefix="/" \
     -Dgtk_doc=false \
     -Dman=false \
-    -Dbroadway_backend=true
+    -Dbroadway_backend=true \
+    -Dtests=false
 
   ninja
   DESTDIR="$pkg" ninja install

gtk/harfbuzz/harfbuzz.SMBuild

@@ -24,7 +24,6 @@ build() {
     --prefix="" \
     --disable-static \
     --with-glib \
-    --with-gobject \
     --with-icu=yes \
     --with-graphite2=yes
 

gtk/libdazzle/libdazzle.SMBuild

@@ -16,9 +16,10 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   meson .. \
-    --prefix="/" 
+    --prefix="/" \
+    -Denable_tests=false
 
   ninja
   DESTDIR="$pkg" ninja install

gtk/libgexiv2/libgexiv2.SMBuild

@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/"
 

gtk/libglade/libglade.SMBuild

@@ -20,6 +20,7 @@ build() {
 
   ./configure \
     --prefix="" \
+    --disable-static \
     $builddist
 
   make

gtk/libmanette/libmanette.SMBuild

@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/" \
     -Ddoc=false \

gtk/libsoup/libsoup.SMBuild

@@ -22,6 +22,7 @@ build() {
     -Dtls_check=false \
     -Dvapi=disabled \
     -Dsysprof=disabled \
+    -Dtests=false \
     ..
 
     ninja

gtk/libunique/libunique.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -Wno-deprecated-declarations" \
+  CFLAGS+=" -Wno-deprecated-declarations" \
   CXXFLAGS="$CFLAGS" \
   ./configure \
     --prefix="" \

gtk/openjpeg/openjpeg.SMBuild

@@ -18,14 +18,15 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \
     -DOPENJPEG_INSTALL_LIB_DIR="lib" \
     -DBUILD_JPWL:BOOL=ON \
     -DBUILD_MJ2:BOOL=ON \
     -DBUILD_JPIP:BOOL=ON \
-    -DBUILD_JP3D:BOOL=ON 
+    -DBUILD_JP3D:BOOL=ON \
+    -DBUILD_STATIC_LIBS=OFF
 
   make
   make install DESTDIR=$pkg

gtk/pango/pango.SMBuild

@@ -19,7 +19,6 @@ build() {
   mkdir -p smbuild && cd smbuild
   meson .. \
     --prefix="/" \
-    -Dintrospection=enabled \
     -Dgtk_doc=false 
 
   ninja
@@ -31,5 +30,5 @@ build() {
 }
 
 sha512sums="
-6b31690ce9746b47fd8ea2f30f26c242d85cc836c812dba273a4d3e43df5484e7b3450b11de019136781dfd3dcac41f1e34189324e4700583eec1fb757763d33  pango-1.50.3.tar.xz
+45574a574fc435be092df488caad05bc0cf0d1ed1713548c4ee7d15a174c1656e2cede319bf49fc9beb9820bbfbaf59d36eb126ac9d69e13bce9d1f215944d80  pango-1.50.3.tar.lz
 "

net/.buildlist.net

@@ -91,3 +91,5 @@ rrdtool
 php
 traceroute
 elinks
+privoxy
+samba

net/privoxy/privoxy.SMBuild

@@ -6,7 +6,7 @@ download="https://www.privoxy.org/sf-download-mirror/Sources/$version%20%28stabl
 desc="Web proxy with advanced filtering capabilities"
 requires="zlib pcre"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -22,7 +22,9 @@ build() {
   sed -i "s/\[ -s \"\$(CONF_DEST)\/\$\$i\" \]/false/" GNUmakefile.in
 
   autoreconf -vif
+}
 
+build() {
   ./configure \
     --prefix="" \
     --sbindir=/bin \
@@ -30,7 +32,6 @@ build() {
     --localstatedir=/var \
     --with-docbook=no \
     --with-user=nobody \
-    --with-group=nogroup \
     --enable-no-gifs \
     --enable-compression \
     --enable-large-file-support 

net/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 @@

net/samba/netapp.patch

@@ -1,85 +0,0 @@
-https://bugzilla.samba.org/show_bug.cgi?id=12776
-
-diff --git a/source3/include/client.h b/source3/include/client.h
-index db8260d..becdf77 100644
---- a/source3/include/client.h
-+++ b/source3/include/client.h
-@@ -61,6 +61,9 @@ struct cli_state {
- 	char *server_os;
- 	char *server_domain;
- 
-+	/* is server_os spinstream2? true/false/not-yet-checked(-1) */
-+	int is_spinstream2;
-+
- 	char *share;
- 	char *dev;
- 
-diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
-index bc5c1b1..6d6b725 100644
---- a/source3/libsmb/clientgen.c
-+++ b/source3/libsmb/clientgen.c
-@@ -111,6 +111,7 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
- 	if (!cli->server_os) {
- 		goto error;
- 	}
-+	cli->is_spinstream2 = -1;
- 	cli->server_type = talloc_strdup(cli, "");
- 	if (!cli->server_type) {
- 		goto error;
-@@ -467,6 +468,24 @@ time_t cli_state_server_time(struct cli_state *cli)
- 	return t;
- }
- 
-+bool cli_state_server_is_spinstream2(struct cli_state *cli)
-+{
-+	int *ret = &cli->is_spinstream2;
-+	if (*ret == -1) {
-+		if (*cli->server_os == '\0') {
-+			DEBUG(1, ("when checking if server is SpinStream2:"
-+				  " server_os field is empty (should have"
-+				  " been sent in Session Setup protocol"
-+				  " response), so ... presuming not"));
-+			*ret = 0;
-+		}
-+		else {
-+			*ret = strequal(cli->server_os, "SpinStream2") ? 1 : 0;
-+		}
-+	}
-+	return *ret == 1;
-+}
-+
- struct cli_echo_state {
- 	bool is_smb2;
- };
-diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
-index 3987477..6371bc2 100644
---- a/source3/libsmb/clireadwrite.c
-+++ b/source3/libsmb/clireadwrite.c
-@@ -89,6 +89,13 @@ static size_t cli_write_max_bufsize(struct cli_state *cli,
- 		useable_space = 0xFFFFFF - data_offset;
- 	} else if (smb1cli_conn_capabilities(cli->conn) & CAP_LARGE_WRITEX) {
- 		useable_space = 0x1FFFF - data_offset;
-+		if (cli_state_server_is_spinstream2(cli))
-+			/*
-+			 * SpinStream2 (NetApp OnTAP, up to 8.3.2, at least;
-+			 * XXX may need to be more discerning than this)
-+			 * can't handle writes > 64k
-+			 */
-+			useable_space = MIN(useable_space, 64 * 1024);
- 	} else {
- 		return min_space;
- 	}
-diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
-index b453733..e334cc6 100644
---- a/source3/libsmb/proto.h
-+++ b/source3/libsmb/proto.h
-@@ -203,6 +203,7 @@ uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid);
- bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
- uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs);
- time_t cli_state_server_time(struct cli_state *cli);
-+bool cli_state_server_is_spinstream2(struct cli_state *cli);
- struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
- 				 struct cli_state *cli, uint16_t num_echos,
- 				 DATA_BLOB data);
-
-

net/samba/netdb-defines.patch

@@ -1,19 +0,0 @@
-diff --git a/nsswitch/wins.c b/nsswitch/wins.c
-index dccb6dd..bb24acb 100644
---- a/nsswitch/wins.c
-+++ b/nsswitch/wins.c
-@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
- #define INADDRSZ 4
- #endif
- 
-+#ifndef NETDB_INTERNAL
-+#define NETDB_INTERNAL -1
-+#endif
-+
-+#ifndef NETDB_SUCCESS
-+#define NETDB_SUCCESS 0
-+#endif
-+
- NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
- 				     struct hostent *he,
- 				     char *buffer,

net/samba/netgroup.patch

@@ -0,0 +1,15 @@
+diff --git a/source3/wscript b/source3/wscript
+index b664b6f..db1fc8b 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -629,8 +629,8 @@ msg.msg_accrightslen = sizeof(fd);
+                                 headers='unistd.h sys/types.h dirent.h',
+                                 define='HAVE_DIRENT_D_OFF')
+ 
+-    if (conf.CONFIG_SET('HAVE_GETDOMAINNAME')):
+-        conf.DEFINE('HAVE_NETGROUP', '1')
++ #   if (conf.CONFIG_SET('HAVE_GETDOMAINNAME')):
++ #       conf.DEFINE('HAVE_NETGROUP', '1')
+ 
+     # Look for CUPS
+     if Options.options.with_cups:

net/samba/samba.SMBuild

@@ -1,12 +1,12 @@
 app=samba
-version=4.15.5
+version=4.18.0
-build=2sml
+build=1sml
 homepage="https://www.samba.org"
 download="https://download.samba.org/pub/samba/stable/samba-$version.tar.gz"
 desc="CIFS file and print server, version 4"
 requires="acl attr netbsd-curses readline libcap tar db popt libaio perl-modules"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
@@ -19,20 +19,21 @@ build() {
   applypatch $srcdir/missing-headers.patch
   applypatch $srcdir/musl_rm_unistd_incl.patch
   applypatch $srcdir/musl_uintptr.patch
-  applypatch $srcdir/netapp.patch
+  applypatch $srcdir/netgroup.patch
-  applypatch $srcdir/netdb-defines.patch
-  applypatch $srcdir/tevent.patch
   applypatch $srcdir/pidl.patch
   applypatch $srcdir/samba-bgqd-include-signal-h.patch
 
-  SAMBAJOBS="$(echo $MAKEFLAGS | sed 's@-j@@')"
+  #SAMBAJOBS="$(echo $MAKEFLAGS | sed 's@-j@@')"
 
   # Enabling quotas results in "[2022/03/05 14:15:09.123806,  0] ../../source3/lib/sysquotas.c:566(sys_get_quota)
   # sys_path_to_bdev() failed for path [.]!
   # in logs, so disable them
   # https://codeberg.org/davidak/nixos-config/issues/5
   # https://lists.samba.org/archive/samba/2010-October/158650.html
+}
 
+build() {
+  unset CFLAGS CXXFLAGS
   ./configure \
     --prefix="/" \
     --bindir=/bin \
@@ -57,7 +58,7 @@ build() {
     --disable-python \
     --without-regedit \
     --without-quotas \
-    --jobs="$SAMBAJOBS" 
+    --disable-fault-handling
 
   make
   make install DESTDIR=$pkg
@@ -75,15 +76,13 @@ build() {
 }
 
 sha512sums="
-39ee6c93e02b1e009648b6fbef27216f0c16152e8b77cd05d00ea2d4ca8efaaf32cf5381e18cbe9e19e4f2c5a319d3754cf04f790dec42afbe62836809cb094a  samba-4.15.5.tar.lz
+bc0eb8bc62fd2c4aa94b452a79e0a31fb3ad52bd46535b5f4c5eff4de8781419c3eb066a8394e704e7d4097c9651932a8de76d5b37cc05547d9a3ed48bf157ae  samba-4.18.0.tar.gz
 bc2df70e327fea5dfbd923600225f1448815d842c37d6937dd74eab7f7699d7f52cd7a8e28a61233974649cf86661a0107dce5019d33b71205e4b41bac73f4e2  add_missing___compar_fn_t.patch
 58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b  getpwent_r.patch
-c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049aca82e58d4daf63ad5553f4c5c51671019bfbbc2781460f0  missing-headers.patch
+9642e0de5a39ab940e0f53040ae20fccdbde471bed9bcca713482f26e7c88451e405bd63d719d0548975c7c4c045b51b0006672d34ec4390c3b5a618ea6c8d85  missing-headers.patch
 9bf4bbc8b03d9ea17d2f8ffeaf3a83541b171936a90bb8d75b08cc5afbdbaaec545c1b3782c90ae2ffc4568ab4e6f15fb21899d80c654a796301e16429c93b65  musl_rm_unistd_incl.patch
 b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93  musl_uintptr.patch
-3b4759dfcf6ec54f2131390c9eb7fd7dd23071e304905cdeaf7a9828fa888cb3dcb5c5bb6a07a634c51d0392ac47f6e22b937faf4354e3b07cfc0de7fdfa28e9  netapp.patch
+f997d0bca9de64a567bccc245bec41e4aa00bacb379d8e348678dcafcf7e723e8716608c5d2d266ad816439b8b93bb8ee28371308a01c9d9c50229f1fc8deb67  netgroup.patch
-1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8  netdb-defines.patch
 c0bbe1186b150a9bb2a0b741a8cfbd7a5109e5fed1eaa07aaa38cf026ebe054d38cc01e2496f0cab7b40f743e1b7ecfbf8a4d5820810226c4152021df65f36dc  pidl.patch
 e98fd19f65d954f04f7e3b5be86e9c4bcc9ac090c40037de77bfeb266617747c514aeb42f3daf84113b2f3374480d25e368bc1fdebc1870458eda12329d2062e  samba-bgqd-include-signal-h.patch
-e7441d4692c354ff265ec5b5666ebd8c02762cffd805b4af6fdcb405e9b7641e195d068b60bb0ed1ffada4db4db84492db598efd37d0a27d66b5b4c923891891  tevent.patch
 "

net/samba/tevent.patch

@@ -1,11 +0,0 @@
---- a/lib/tevent/tevent.h	2020-09-27 13:04:02.969331767 +0530
-+++ b/lib/tevent/tevent.h	2020-09-29 13:13:48.807482835 +0530
-@@ -31,6 +31,8 @@
- #include <stdint.h>
- #include <talloc.h>
- #include <sys/time.h>
-+#include <sys/stat.h> 
-+#include <sys/types.h>
- #include <stdbool.h>
- 
- struct tevent_context;