diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/ap/man-pages/man-pages.SlackBuild | 4 | ||||
| -rwxr-xr-x | source/l/libyaml/libyaml.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/n/dnsmasq/dnsmasq.SlackBuild | 5 | ||||
| -rw-r--r-- | source/n/dnsmasq/dnsmasq.nettle35.diff | 20 |
4 files changed, 4 insertions, 27 deletions
diff --git a/source/ap/man-pages/man-pages.SlackBuild b/source/ap/man-pages/man-pages.SlackBuild index db9bae934..168a4cb60 100755 --- a/source/ap/man-pages/man-pages.SlackBuild +++ b/source/ap/man-pages/man-pages.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=man-pages VERSION=${VERSION:-$(echo man-pages-5.*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ARCH=noarch -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # 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 @@ -98,7 +98,7 @@ rm -r $TEMPDIR # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - man-pages-$VERSION/{CONTRIBUTING,Changes,README,man-pages-5.05.Announce,man-pages-5.05.lsm} \ + man-pages-$VERSION/{CONTRIBUTING,Changes,README,man-pages-${VERSION}.Announce,man-pages-${VERSION}.lsm} \ man-pages-posix-2013-a/POSIX-COPYRIGHT \ $PKG/usr/doc/${PKGNAM}-$VERSION diff --git a/source/l/libyaml/libyaml.SlackBuild b/source/l/libyaml/libyaml.SlackBuild index ece5f6b4b..c2bcc0a7a 100755 --- a/source/l/libyaml/libyaml.SlackBuild +++ b/source/l/libyaml/libyaml.SlackBuild @@ -117,7 +117,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - README LICENSE doc \ + announcement* README* ReadMe* LICENSE* License* doc \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index e34d3920f..29a79927c 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dnsmasq VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"} @@ -72,9 +72,6 @@ zcat $CWD/dnsmasq.libidn2.diff.gz | patch -p1 --verbose --backup --suffix=.orig # Fix build with Linux 5.4.x: zcat $CWD/dnsmasq-2.80-SIOCGSTAMP.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Fix build with nettle-3.5: -zcat $CWD/dnsmasq.nettle35.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - make $NUMJOBS all-i18n PREFIX=/usr MANDIR=/usr/man COPTS="$EXTRA_BUILD_OPTS" || exit 1 make install-i18n PREFIX=/usr DESTDIR=$PKG MANDIR=/usr/man COPTS="$EXTRA_BUILD_OPTS" || exit 1 chmod 0755 $PKG/usr/sbin/dnsmasq diff --git a/source/n/dnsmasq/dnsmasq.nettle35.diff b/source/n/dnsmasq/dnsmasq.nettle35.diff deleted file mode 100644 index f90b1a490..000000000 --- a/source/n/dnsmasq/dnsmasq.nettle35.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/crypto.c.orig 2018-10-18 13:21:55.000000000 -0500 -+++ ./src/crypto.c 2020-02-22 13:04:53.071018567 -0600 -@@ -294,7 +294,7 @@ - if (!(key_256 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_256, &nettle_secp_256r1); -+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1()); - } - - key = key_256; -@@ -307,7 +307,7 @@ - if (!(key_384 = whine_malloc(sizeof(struct ecc_point)))) - return 0; - -- nettle_ecc_point_init(key_384, &nettle_secp_384r1); -+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1()); - } - - key = key_384; |