From 7d9c2791415eda030376b7243b0ab9ae94a1c54e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 21 Jul 2020 19:59:48 +0000 Subject: Tue Jul 21 19:59:48 UTC 2020 a/kernel-firmware-20200721_2b823fc-noarch-1.txz: Upgraded. d/python3-3.8.5-x86_64-1.txz: Upgraded. d/re2c-2.0-x86_64-1.txz: Upgraded. l/farstream-0.2.9-x86_64-1.txz: Added. Needed by pidgin-2.14.1. l/libnice-0.1.17-x86_64-1.txz: Added. Needed by farstream-0.2.9. n/iptraf-ng-1.2.1-x86_64-1.txz: Upgraded. n/proftpd-1.3.7a-x86_64-1.txz: Upgraded. xap/pidgin-2.14.1-x86_64-1.txz: Upgraded. This update adds support for voice and video via Farstream. --- source/d/scons/scons.SlackBuild | 2 + ....2.8-configure-add-check-for-glib-mkenums.patch | 33 +++++ ...-to-backwards-incompatible-change-in-GNU-.patch | 38 ++++++ source/l/farstream/farstream.SlackBuild | 143 +++++++++++++++++++++ source/l/farstream/farstream.url | 1 + source/l/farstream/slack-desc | 19 +++ source/l/libnice/libnice.SlackBuild | 135 +++++++++++++++++++ source/l/libnice/libnice.url | 1 + source/l/libnice/slack-desc | 19 +++ source/n/proftpd/proftpd.SlackBuild | 4 +- source/xap/pidgin/pidgin.SlackBuild | 3 +- 11 files changed, 394 insertions(+), 4 deletions(-) create mode 100644 source/l/farstream/farstream-0.2.8-configure-add-check-for-glib-mkenums.patch create mode 100644 source/l/farstream/farstream-0.2.9-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch create mode 100755 source/l/farstream/farstream.SlackBuild create mode 100644 source/l/farstream/farstream.url create mode 100644 source/l/farstream/slack-desc create mode 100755 source/l/libnice/libnice.SlackBuild create mode 100644 source/l/libnice/libnice.url create mode 100644 source/l/libnice/slack-desc (limited to 'source') diff --git a/source/d/scons/scons.SlackBuild b/source/d/scons/scons.SlackBuild index 1daa1d30c..f27faebe3 100755 --- a/source/d/scons/scons.SlackBuild +++ b/source/d/scons/scons.SlackBuild @@ -99,6 +99,8 @@ done if [ ! -r $PKG/usr/man/man1/scons.1.gz ]; then mkdir -p $PKG/usr/man/man1 cp -a $CWD/scons.1.gz $PKG/usr/man/man1 + chown root:root $PKG/usr/man/man1/scons.1.gz + chmod 644 $PKG/usr/man/man1/scons.1.gz else echo "ERROR: actually found scons man page! Please comment out the section of" echo "the build script that tries to install it, and delete the old man page." diff --git a/source/l/farstream/farstream-0.2.8-configure-add-check-for-glib-mkenums.patch b/source/l/farstream/farstream-0.2.8-configure-add-check-for-glib-mkenums.patch new file mode 100644 index 000000000..5236a6fce --- /dev/null +++ b/source/l/farstream/farstream-0.2.8-configure-add-check-for-glib-mkenums.patch @@ -0,0 +1,33 @@ +From 573e29a3f6b379c1bd1dba8c73c65a5f885176a0 Mon Sep 17 00:00:00 2001 +From: Stefan Becker +Date: Thu, 4 Jul 2019 10:54:03 +0300 +Subject: [PATCH] configure: add check for glib-mkenums + +This fixes build failure for latest source with autoconf. Add the check +glib-mkenums and definition of GLIB_MKENUMS to configure.ac + +Fixes #16 +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 31be2770..431aa2da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -264,6 +264,12 @@ FS_PREFIX="`$PKG_CONFIG --variable=prefix farstream-$FS_APIVERSION`" + AC_SUBST(GLIB_PREFIX) + AC_SUBST(FS_PREFIX) + ++dnl Check for glib-2.0 tools ++AC_MSG_CHECKING([for glib-mkenums]) ++GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`" ++AC_SUBST(GLIB_MKENUMS) ++AC_MSG_RESULT($GLIB_MKENUMS) ++ + dnl *** set variables based on configure arguments *** + + dnl set license and copyright notice +-- +2.21.0 + diff --git a/source/l/farstream/farstream-0.2.9-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch b/source/l/farstream/farstream-0.2.9-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch new file mode 100644 index 000000000..7b1ec9a9e --- /dev/null +++ b/source/l/farstream/farstream-0.2.9-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch @@ -0,0 +1,38 @@ +From 54987d445ea714b467d901b7daf8c09ed0644189 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Thu, 12 Mar 2020 14:07:23 +0100 +Subject: [PATCH] build: Adapt to backwards incompatible change in GNU Make 4.3 + +GNU Make 4.3 has a backwards incompatible change affecting the use of +number signs or hashes (ie., #) inside function invocations. See: +https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html + +In this case, it would expand the '\#' in the '\n\#include \"$(h)\"' +argument to the foreach call to '\#', not '#'. This would lead to +spurious backslashes in front of the '#include' directives in the +generated fs-enumtypes.c file. + +Spotted by Ernestas Kulik. + +https://gitlab.freedesktop.org/farstream/farstream/-/merge_requests/4 +--- + common-modified/gst-glib-gen.mak | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak +index 14f1ba37c788..2247a41c49ea 100644 +--- a/common-modified/gst-glib-gen.mak ++++ b/common-modified/gst-glib-gen.mak +@@ -6,7 +6,8 @@ + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) +-- +2.24.1 + diff --git a/source/l/farstream/farstream.SlackBuild b/source/l/farstream/farstream.SlackBuild new file mode 100755 index 000000000..07cf2bead --- /dev/null +++ b/source/l/farstream/farstream.SlackBuild @@ -0,0 +1,143 @@ +#!/bin/bash + +# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=farstream +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +zcat $CWD/farstream-0.2.8-configure-add-check-for-glib-mkenums.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/farstream-0.2.9-build-Adapt-to-backwards-incompatible-change-in-GNU-.patch.gz | patch -p1 --verbose || exit 1 + +autoreconf -vif + +# Configure, build, and install: +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --disable-silent-rules \ + --with-package-name="Slackware Farstream $VERSION package" \ + --with-package-origin="ftp.slackware.com" \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* ChangeLog COPYING* NEWS* README* TODO* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/farstream/farstream.url b/source/l/farstream/farstream.url new file mode 100644 index 000000000..3eaaa7214 --- /dev/null +++ b/source/l/farstream/farstream.url @@ -0,0 +1 @@ +http://freedesktop.org/software/farstream/releases/farstream diff --git a/source/l/farstream/slack-desc b/source/l/farstream/slack-desc new file mode 100644 index 000000000..f62c8a947 --- /dev/null +++ b/source/l/farstream/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +farstream: farstream (GStreamer videoconferencing support) +farstream: +farstream: Farstream is a collection of GStreamer modules and libraries for +farstream: videoconferencing. +farstream: +farstream: Homepage: https://www.freedesktop.org/wiki/Software/Farstream +farstream: +farstream: +farstream: +farstream: +farstream: diff --git a/source/l/libnice/libnice.SlackBuild b/source/l/libnice/libnice.SlackBuild new file mode 100755 index 000000000..696287bd9 --- /dev/null +++ b/source/l/libnice/libnice.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/bash + +# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=libnice +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* ChangeLog COPYING* NEWS* README* TODO* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libnice/libnice.url b/source/l/libnice/libnice.url new file mode 100644 index 000000000..19a95ab48 --- /dev/null +++ b/source/l/libnice/libnice.url @@ -0,0 +1 @@ +https://libnice.freedesktop.org/#download diff --git a/source/l/libnice/slack-desc b/source/l/libnice/slack-desc new file mode 100644 index 000000000..ec97c87f3 --- /dev/null +++ b/source/l/libnice/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libnice: libnice (Interactive Connectivity Establishment library) +libnice: +libnice: libnice is an implementation of the IETF draft Interactive +libnice: Connectivity Establishment standard (ICE). ICE is useful for +libnice: applications that want to establish peer-to-peer UDP data streams. +libnice: It automates the process of traversing NATs and provides security +libnice: against some attacks. Existing standards that use ICE include the +libnice: Session Initiation Protocol (SIP) and Jingle, XMPP extension for +libnice: audio/video calls. +libnice: +libnice: Homepage: https://libnice.freedesktop.org diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild index 86365289e..6e7ea646e 100755 --- a/source/n/proftpd/proftpd.SlackBuild +++ b/source/n/proftpd/proftpd.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=proftpd -VERSION=1.3.6d -DIRVER=1.3.6d +VERSION=1.3.7a +DIRVER=1.3.7a BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild index 676a5c215..4bd95586e 100755 --- a/source/xap/pidgin/pidgin.SlackBuild +++ b/source/xap/pidgin/pidgin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pidgin VERSION=${VERSION:-$(echo $PKGNAM-2.*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} PIDGINENC=${PIDGINENC:-3.1} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -106,7 +106,6 @@ CXXFLAGS="$SLKCFLAGS" \ --with-nspr-includes="$(pkg-config --variable=includedir nspr)" \ --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \ --with-system-ssl-certs=/etc/ssl/certs \ - --disable-vv \ --enable-gtkspell \ --enable-cyrus-sasl \ --enable-perl \ -- cgit v1.2.3