Added proper build functions in base/rpi-userland

Added licenses to net/{autossh,comgt,fcgiwrap,fail2ban,wpa_supplicant}
Fixed prefix, added code to backup and configure additional conf files in net/nginx
Function call reordering and some cleanups in net/php
Replaced old init script with runit script in net/privoxy

base/rpi-userland/rpi-userland.SMBuild

@@ -5,7 +5,7 @@ homepage="https://github.com/raspberrypi/userland"
 desc="Common raspberry-pi userland utilities"
 requires="musl"
 
-build() {
+prepbuilddir() {
   compileonlyfor aarch64
   mkandenterbuilddir
   rm -rf $app-$version
@@ -19,6 +19,9 @@ build() {
   [ -e /include/execinfo.h ] && mv /include/execinfo.h /include/execinfo.h.bak
 
   sed -i -e 's/sudo //' buildme
+}
+
+build() {
   ./buildme --aarch64 "$pkg"
 
   # The build script does not exit with a status 0, so we do a couple of file checks ourselves

net/autossh/LICENSE

@@ -0,0 +1,16 @@
+ Copyright (c) Carson Harding, 2002-2018.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are freely permitted.
+ 
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+ THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

net/autossh/autossh.SMBuild

@@ -1,6 +1,6 @@
 app=autossh
 version=1.4g
-build=1sml
+build=2sml
 homepage="http://www.harding.motd.ca/autossh/"
 download="https://www.harding.motd.ca/autossh/autossh-$version.tgz"
 desc="Utility to automatically restart SSH sessions and tunnels"
@@ -23,7 +23,7 @@ build() {
   install -Dm 755 autossh $pkg/bin/autossh
   install -Dm 644 autossh.1 $pkg/share/man/man1/autossh.1
 
-  cp README autossh.host rscreen $pkgdocs/
+  cp $srcdir/LICENSE autossh.host rscreen $pkgdocs/
 
   mkfinalpkg
 }

net/comgt/LICENSE

@@ -0,0 +1,15 @@
+  Copyright (C) 2003  Paul Hardwick <paul@peck.org>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

net/comgt/comgt.SMBuild

@@ -1,6 +1,6 @@
 app=comgt
 version=0.32
-build=1sml
+build=2sml
 homepage="https://sourceforge.net/projects/comgt"
 download="https://sourceforge.net/projects/comgt/files/comgt/$version/comgt.$version.tgz"
 desc="Utility to interact with 2G, 3G and LTE modems via standard AT command set"
@@ -19,13 +19,15 @@ prepbuilddir() {
 
 build() {
   make
+  install -Dm 755 comgt $pkg/bin/comgt
 
-  mkdir -p $pkg/bin $pkg/etc/comgt/examples $pkg/share/man/man1
-  cp comgt $pkg/bin/
+  mkdir -p $pkg/etc/comgt/examples $pkg/share/man/man1
   cp *.1 $pkg/share/man/man1/
   cp scripts/* $pkg/etc/comgt/examples/
   cp $srcdir/balance.* $pkg/etc/comgt/examples/
 
+  cp $srcdir/LICENSE $pkgdocs/
+
   mkfinalpkg
 }
 

net/fail2ban/fail2ban.SMBuild

@@ -1,6 +1,6 @@
 app=fail2ban
 version=1.0.2
-build=1sml
+build=2sml
 homepage="http://www.fail2ban.org/wiki/index.php/Main_Page"
 download="https://github.com/fail2ban/fail2ban/archive/refs/tags/$version.tar.gz"
 desc="Log-based intrusion detection and prevention system written in Python"
@@ -19,6 +19,8 @@ build() {
   sh fail2ban-2to3
   python setup.py install --prefix="" --root=$pkg
 
+  cp COPYING $pkgdocs/
+
   # move config files to .new
   ( 
     cd $pkg/etc/fail2ban 

net/fcgiwrap/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2007-2013 Grzegorz Nosek
+ 
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

net/fcgiwrap/fcgiwrap.SMBuild

@@ -1,6 +1,6 @@
 app=fcgiwrap
 version=1.1.0
-build=1sml
+build=2sml
 homepage="https://github.com/gnosek/fcgiwrap"
 download="https://github.com/gnosek/fcgiwrap/archive/refs/tags/$version.tar.gz"
 desc="Simple FastCGI wrapper for CGI scripts"
@@ -28,6 +28,8 @@ build() {
   make
   make install DESTDIR=$pkg
 
+  cp $srcdir/LICENSE $pkgdocs/
+
   install -Dm 0755 $srcdir/spawn-fcgi $pkg/bin/spawn-fcgi
   install -Dm 0755 $srcdir/rc.spawn-fcgi $pkg/etc/rc.d/rc.spawn-fcgi
 

net/nginx/doinst.sh

@@ -0,0 +1,22 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/nginx/fastcgi_params.new
+config etc/nginx/fastcgi.conf.new
+config etc/nginx/mime.types.new
+config etc/nginx/nginx.conf.new
+config etc/nginx/koi-utf.new
+config etc/nginx/koi-win.new
+config etc/nginx/scgi_params.new
+config etc/nginx/uwsgi_params.new
+config etc/nginx/win-utf.new

net/nginx/nginx.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 build() {
   CC="$CC" \
   ./configure \
-    --prefix="" \
+    --prefix="/var/lib" \
     --with-http_ssl_module \
     --with-http_v2_module \
     --with-http_stub_status_module \
@@ -50,6 +50,14 @@ build() {
 
   preprunitservice nginx down
 
+  (
+    cd $pkg/etc/nginx
+    for conffile in fastcgi_params fastcgi.conf mime.types nginx.conf koi-utf \
+      koi-win scgi_params uwsgi_params win-utf ; do
+        mv $conffile $conffile.new
+    done
+  )
+
   mkfinalpkg
 }
 

net/php/php.SMBuild

@@ -1,7 +1,7 @@
 app=php
 version=7.4.33
 rrdversion=2.0.3
-build=2sml
+build=3sml
 homepage="https://www.php.net/"
 download="https://www.php.net/distributions/php-$version.tar.xz"
 desc="Scripting language suited for creating dynamic websites"
@@ -13,18 +13,19 @@ prepbuilddir() {
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
-  fixbuilddirpermissions
-}
 
-build() {
   # Add the rrd graph module
   (
     cd ext
     tar xf $srcdir/rrd-$rrdversion.tgz
   )
 
-  ./buildconf -f
+  fixbuilddirpermissions
 
+  ./buildconf -f
+}
+
+build() {
   ./configure \
     --prefix="" \
     --sysconfdir=/etc/php \
@@ -74,6 +75,8 @@ build() {
   make
   make install INSTALL_ROOT=$pkg 
 
+  cp LICENSE $pkgdocs/
+
   install -Dm 644 sapi/fpm/init.d.php-fpm $pkg/etc/rc.d/rc.php-fpm.new
   install -Dm 644 $srcdir/php.ini $pkg/etc/php/php.ini.new
 

net/privoxy/privoxy.SMBuild

@@ -1,6 +1,6 @@
 app=privoxy
 version=3.0.33
-build=1sml
+build=2sml
 homepage="https://www.privoxy.org/"
 download="https://www.privoxy.org/sf-download-mirror/Sources/$version%20%28stable%29/privoxy-$version-stable-src.tar.gz"
 desc="Web proxy with advanced filtering capabilities"
@@ -30,6 +30,7 @@ build() {
     --sbindir=/bin \
     --sysconfdir=/etc/"$app" \
     --localstatedir=/var \
+    --docdir="/share/doc/$app-$version" \
     --with-docbook=no \
     --with-user=nobody \
     --enable-no-gifs \
@@ -39,6 +40,8 @@ build() {
   make
   make install DESTDIR=$pkg
 
+  preprunitservice privoxy down
+
   (
     cd $pkg/etc/privoxy
     for f in config match-all.action regression-tests.action trust user.action user.filter ;
@@ -46,8 +49,7 @@ build() {
     done
   )
 
-  mv $pkg/share/doc/LICENSE $pkgdocs/
-  install -Dm 755 $srcdir/rc.privoxy $pkg/etc/rc.d/rc.privoxy
+  #mv $pkg/share/doc/LICENSE $pkgdocs/
 
   mkfinalpkg
 }

net/privoxy/privoxy.run

@@ -0,0 +1,4 @@
+#!/bin/sh
+user="nobody"
+config="/etc/privoxy/config"
+exec privoxy --no-daemon --user $user $config > /dev/null 2>&1

net/privoxy/rc.privoxy

@@ -1,39 +0,0 @@
-#!/bin/sh 
-# 
-# /etc/rc.d/rc.privoxy
-# 
-# Start/stop/restart the privoxy server. 
-#
-
-prvy_pid="/var/run/privoxy.pid"
-prvy_user="nobody" 
-prvy_config="/etc/privoxy/config"
- 
-prvy_start() { 
-    echo "Starting Privoxy" 
-    /bin/privoxy --no-daemon --pidfile $prvy_pid --user $prvy_user $prvy_config > /dev/null 2>&1 &
-} 
-
-prvy_stop() { 
-  killall privoxy
-} 
-
-prvy_restart() { 
-  prvy_stop 
-  sleep 2 
-  prvy_start 
-} 
-
-case "$1" in 
-'start') 
-  prvy_start 
-  ;; 
-'stop') 
-  prvy_stop 
-  ;; 
-'restart') 
-  prvy_restart 
-  ;; 
-*) 
-  echo "Usage: $0 {start|stop|restart}" 
-esac

net/wpa-supplicant/wpa-supplicant.SMBuild

@@ -1,7 +1,7 @@
 app=wpa-supplicant
-sapp="$( echo $app | sed 's@-@_@')"
+sapp="${app/-/_}"
 version=2.10
-build=1sml
+build=2sml
 homepage="https://w1.fi/"
 download="https://w1.fi/releases/wpa_supplicant-$version.tar.gz"
 desc="WPA/WPA2/IEEE 802.1X Supplicant"
@@ -26,6 +26,8 @@ build() {
   make LIBDIR=/lib BINDIR=/bin all eapol_test
   make install LIBDIR=/lib BINDIR=/bin DESTDIR=$pkg
 
+  cp ../COPYING $pkgdocs/LICENSE
+
   mkdir -p $pkg/share/dbus-1/{system.d,system-services}
   cp dbus/fi.w1.wpa_supplicant1.service $pkg/share/dbus-1/system-services/
   cp dbus/dbus-wpa_supplicant.conf $pkg/share/dbus-1/system.d/