From 6371ee337f229ef7fd9dc4800b593589def96747 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 24 Sep 2018 21:37:09 +0000 Subject: Mon Sep 24 21:37:09 UTC 2018 d/Cython-0.28.5-x86_64-1.txz: Upgraded. d/help2man-1.47.7-x86_64-1.txz: Upgraded. d/meson-0.48.0-x86_64-1.txz: Upgraded. d/python-setuptools-40.4.3-x86_64-1.txz: Upgraded. l/M2Crypto-0.30.1-x86_64-1.txz: Upgraded. l/cairo-1.15.14-x86_64-1.txz: Upgraded. l/librsvg-2.44.4-x86_64-1.txz: Upgraded. l/pycairo-1.17.1-x86_64-1.txz: Upgraded. l/pycurl-7.43.0.2-x86_64-1.txz: Upgraded. l/pyparsing-2.2.1-x86_64-1.txz: Upgraded. n/ModemManager-1.8.2-x86_64-1.txz: Upgraded. n/bind-9.12.2_P2-x86_64-1.txz: Upgraded. This update fixes security issues: There was a long-existing flaw in the documentation for ms-self, krb5-self, ms-subdomain, and krb5-subdomain rules in update-policy statements. Though the policies worked as intended, operators who configured their servers according to the misleading documentation may have thought zone updates were more restricted than they were; users of these rule types are advised to review the documentation and correct their configurations if necessary. New rule types matching the previously documented behavior will be introduced in a future maintenance release. named could crash during recursive processing of DNAME records when deny-answer-aliases was in use. This flaw is disclosed in CVE-2018-5740. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-5740 (* Security fix *) n/httpd-2.4.35-x86_64-1.txz: Upgraded. This release fixes bugs and regressions in httpd-2.4.34, adds an apache2ctl -> apachectl symlink, and no longer automatically overwrites rc.httpd when upgraded. --- source/d/help2man/help2man.SlackBuild | 2 +- source/d/meson/meson.SlackBuild | 3 +++ ....exit.1.if.builddir.is.already.configured.patch | 29 ++++++++++++++++++++++ source/d/meson/meson.url | 2 +- source/l/M2Crypto/M2Crypto.SlackBuild | 12 ++++----- source/l/M2Crypto/M2Crypto.url | 1 + source/l/M2Crypto/typing.url | 1 + source/l/cairo/cairo.SlackBuild | 6 ++--- source/l/cairo/paredown.sh | 6 ++--- source/l/pycairo/pycairo.SlackBuild | 2 +- source/l/pycurl/pycurl.SlackBuild | 2 +- source/l/pyparsing/pyparsing.SlackBuild | 6 ++--- source/l/pyparsing/pyparsing.url | 1 + source/l/pyparsing/slack-desc | 2 +- source/n/ModemManager/slack-desc | 4 +-- source/n/bind/bind.SlackBuild | 2 +- source/n/httpd/doinst.sh | 5 +--- source/n/httpd/httpd.SlackBuild | 5 ++++ source/n/httpd/httpd.url | 4 +-- 19 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch create mode 100644 source/l/M2Crypto/M2Crypto.url create mode 100644 source/l/M2Crypto/typing.url create mode 100644 source/l/pyparsing/pyparsing.url (limited to 'source') diff --git a/source/d/help2man/help2man.SlackBuild b/source/d/help2man/help2man.SlackBuild index a34dc27f7..7dccd87c0 100755 --- a/source/d/help2man/help2man.SlackBuild +++ b/source/d/help2man/help2man.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=help2man VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild index 381933778..eaa4b8074 100755 --- a/source/d/meson/meson.SlackBuild +++ b/source/d/meson/meson.SlackBuild @@ -53,6 +53,9 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 +# Fix regression in 0.48.0: +zcat $CWD/meson.dont.exit.1.if.builddir.is.already.configured.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch b/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch new file mode 100644 index 000000000..37bbec2cd --- /dev/null +++ b/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch @@ -0,0 +1,29 @@ +From 2f0285c7ef3a3dab71e8d6f4df92ef978470c553 Mon Sep 17 00:00:00 2001 +From: Xavier Claessens +Date: Mon, 24 Sep 2018 09:24:38 -0400 +Subject: [PATCH] Return code 0 when builddir is already configured + +This is a regression in Meson 0.48.0, commit 674ae46, Meson used to +exit(0) when running setup command in a builddir already configured. +Changing to exit(1) breaks some build tools that does "meson builddir +&& ninja -C builddir". + +Closes #4247. +--- + mesonbuild/mesonmain.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py +index cd925e51f2..dfad2e7848 100644 +--- a/mesonbuild/mesonmain.py ++++ b/mesonbuild/mesonmain.py +@@ -113,7 +113,7 @@ def validate_dirs(self, dir1, dir2, reconfigure): + '\nIf build failures persist, manually wipe your build directory to clear any\n' + 'stored system data.\n' + '\nTo change option values, run "meson configure" instead.') +- sys.exit(1) ++ sys.exit(0) + else: + if reconfigure: + print('Directory does not contain a valid build tree:\n{}'.format(build_dir)) + diff --git a/source/d/meson/meson.url b/source/d/meson/meson.url index 3413f6591..4f96597b8 100644 --- a/source/d/meson/meson.url +++ b/source/d/meson/meson.url @@ -1 +1 @@ -https://github.com/mesonbuild/meson/releases/download/0.47.2/meson-0.47.2.tar.gz +https://github.com/mesonbuild/meson/releases/download/0.48.0/meson-0.48.0.tar.gz diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild index ab134c786..dadb99276 100755 --- a/source/l/M2Crypto/M2Crypto.SlackBuild +++ b/source/l/M2Crypto/M2Crypto.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=M2Crypto VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,9 +70,9 @@ cp -a \ # Embed required dep typing module: cd $TMP -rm -rf typing-3.6.4 -tar xvf $CWD/typing-3.6.4.tar.xz || exit 1 -cd typing-3.6.4 || exit 1 +rm -rf typing-3.6.6 +tar xvf $CWD/typing-3.6.6.tar.xz || exit 1 +cd typing-3.6.6 || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -80,10 +80,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; python setup.py install --root=$PKG || exit 1 -mkdir -p $PKG/usr/doc/typing-3.6.4 +mkdir -p $PKG/usr/doc/typing-3.6.6 cp -a \ CHANGES INSTALL* LICENCE* PKG-INFO README* doc/* \ - $PKG/usr/doc/typing-3.6.4 + $PKG/usr/doc/typing-3.6.6 ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ diff --git a/source/l/M2Crypto/M2Crypto.url b/source/l/M2Crypto/M2Crypto.url new file mode 100644 index 000000000..637707c23 --- /dev/null +++ b/source/l/M2Crypto/M2Crypto.url @@ -0,0 +1 @@ +http://pypi.python.org/pypi/M2Crypto/ diff --git a/source/l/M2Crypto/typing.url b/source/l/M2Crypto/typing.url new file mode 100644 index 000000000..1c61f277a --- /dev/null +++ b/source/l/M2Crypto/typing.url @@ -0,0 +1 @@ +http://pypi.python.org/pypi/typing/ diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild index 3af950e6e..ab9c8cefb 100755 --- a/source/l/cairo/cairo.SlackBuild +++ b/source/l/cairo/cairo.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cairo -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +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 @@ -67,7 +67,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/l/cairo/paredown.sh b/source/l/cairo/paredown.sh index a24369747..241421483 100755 --- a/source/l/cairo/paredown.sh +++ b/source/l/cairo/paredown.sh @@ -41,11 +41,11 @@ touch -r $PKGNAM-$VERSION.tar.xz tmp-timestamp || exit 1 rm -rf $PKGNAM-$VERSION tar xvf $PKGNAM-$VERSION.tar.xz || exit 1 rm -f $PKGNAM-$VERSION/test/reference/* -rm -f $PKGNAM-$VERSION.tar.xz +rm -f $PKGNAM-$VERSION.tar.?z tar cvf $PKGNAM-$VERSION.tar $PKGNAM-$VERSION touch -r tmp-timestamp $PKGNAM-$VERSION.tar -xz -9 -v $PKGNAM-$VERSION.tar +plzip -9 -v $PKGNAM-$VERSION.tar rm -rf $PKGNAM-$VERSION tmp-timestamp -echo "Repacking of $PKGNAM-$VERSION.tar.xz complete." +echo "Repacking of $PKGNAM-$VERSION.tar.lz complete." diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild index 137d16be5..10c6e6bf1 100755 --- a/source/l/pycairo/pycairo.SlackBuild +++ b/source/l/pycairo/pycairo.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycairo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/pycurl/pycurl.SlackBuild b/source/l/pycurl/pycurl.SlackBuild index b0c220eb1..38911d9b7 100755 --- a/source/l/pycurl/pycurl.SlackBuild +++ b/source/l/pycurl/pycurl.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycurl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pyparsing/pyparsing.SlackBuild b/source/l/pyparsing/pyparsing.SlackBuild index 7e1f56731..841e793b5 100755 --- a/source/l/pyparsing/pyparsing.SlackBuild +++ b/source/l/pyparsing/pyparsing.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pyparsing -VERSION=${VERSION:-$(echo pyparsing-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo pyparsing-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -54,7 +54,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ diff --git a/source/l/pyparsing/pyparsing.url b/source/l/pyparsing/pyparsing.url new file mode 100644 index 000000000..cdd29d560 --- /dev/null +++ b/source/l/pyparsing/pyparsing.url @@ -0,0 +1 @@ +http://pypi.python.org/pypi/pyparsing/ diff --git a/source/l/pyparsing/slack-desc b/source/l/pyparsing/slack-desc index 66a2a3804..dabff074e 100644 --- a/source/l/pyparsing/slack-desc +++ b/source/l/pyparsing/slack-desc @@ -14,6 +14,6 @@ pyparsing: the use of regular expressions. The pyparsing module provides a pyparsing: library of classes that client code uses to construct the grammar pyparsing: directly in Python code. pyparsing: -pyparsing: Homepage: http://pyparsing.wikispaces.com/ +pyparsing: Homepage: http://pypi.python.org/pypi/pyparsing/ pyparsing: pyparsing: diff --git a/source/n/ModemManager/slack-desc b/source/n/ModemManager/slack-desc index 8dd384bc9..dcec28670 100644 --- a/source/n/ModemManager/slack-desc +++ b/source/n/ModemManager/slack-desc @@ -11,8 +11,8 @@ ModemManager: ModemManager: ModemManager provides a unified high level API for communicating with ModemManager: mobile broadband modems. ModemManager: -ModemManager: For more info, see: -ModemManager: https://www.freedesktop.org/wiki/Software/ModemManager +ModemManager: Homepage: https://www.freedesktop.org/wiki/Software/ModemManager +ModemManager: ModemManager: ModemManager: ModemManager: diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index 9dca3e5c9..e9e234ba4 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind -VERSION=${VERSION:-9.12.2-P1} +VERSION=${VERSION:-9.12.2-P2} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/n/httpd/doinst.sh b/source/n/httpd/doinst.sh index e233c362b..b45fd2aaf 100644 --- a/source/n/httpd/doinst.sh +++ b/source/n/httpd/doinst.sh @@ -20,8 +20,7 @@ preserve_perms() { cat ${NEW} > ${NEW}.incoming mv ${NEW}.incoming ${NEW} fi - # Don't use config() -- we always want to install this, changed or unchanged. - #config ${NEW} + config ${NEW} } if [ ! -e var/log/httpd ]; then @@ -55,8 +54,6 @@ fi # Keep same perms when installing rc.httpd.new: preserve_perms etc/rc.d/rc.httpd.new -# Always install the new rc.httpd: -mv etc/rc.d/rc.httpd.new etc/rc.d/rc.httpd # Handle config files. Unless this is a fresh installation, the # admin will have to move the .new files into place to complete diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index cb7db3d77..3c15fd8f2 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -191,6 +191,11 @@ cat $CWD/rc.httpd > $PKG/etc/rc.d/rc.httpd.new mkdir -p $PKG/etc/logrotate.d cat $CWD/logrotate.httpd > $PKG/etc/logrotate.d/httpd.new +# Add symlink that letsencrypt wants: +( cd $PKG/usr/sbin + ln -sf apachectl apache2ctl +) + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url index 152982ae4..f9402a477 100644 --- a/source/n/httpd/httpd.url +++ b/source/n/httpd/httpd.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2 -http://www.apache.org/dist/httpd/httpd-2.4.34.tar.bz2.asc +http://www.apache.org/dist/httpd/httpd-2.4.35.tar.bz2 +http://www.apache.org/dist/httpd/httpd-2.4.35.tar.bz2.asc -- cgit v1.2.3