Merge branch '3.6' into 3.7

This commit is contained in:
Juergen Daubert 2022-09-27 10:58:19 +02:00
commit e2364e048d
9 changed files with 31 additions and 19 deletions

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/UVJnPKXBV8vc4vMK9VCfm+oRWuz/JRlH+835sWy3lT70OEJRbzd2+OZGVVs0QBCQT8TpNHjqWmVP05hrmI+hAY=
SHA256 (Pkgfile) = bb9cf4ba7de4c3ac954514ff22fdc7f4285c111ad273504600bffbc8a42df8c2
RWSE3ohX2g5d/exgOCpjfYqqmaPKmcasRp6v+VF6EOKEhhnvJOLbCEV+Jd5sZnr8nehsgWn7li7BeK/cmMLlxEsF//aQuzunbwE=
SHA256 (Pkgfile) = fdbb616dd1a3bc97ab42b0e3faf8cc04a6aafbdc06e6f2d4d13a3b880b7309e7
SHA256 (.footprint) = a9b2926c49f21dee91cc4b4186a4abc2494b610a40941467c281573e2f9c76d9
SHA256 (dnsmasq-2.86.tar.xz) = 28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08
SHA256 (dnsmasq-config.patch) = 251536d779c4d9333c3ac13153948cfc4dea599548f8ff6f4ad3488193cc0716
SHA256 (dnsmasq-2.87.tar.xz) = 0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a
SHA256 (dnsmasq-config.patch) = 24c96e3a1b1098f5a305aebf921a54e1b3ca15bbe7bc5692ce372bc1ab19492b
SHA256 (dnsmasq) = af4d81797efb286246be33880bafdbd6691172d01179592eb95a637a86d3fa1b

View File

@ -4,8 +4,8 @@
# Depends on: nettle
name=dnsmasq
version=2.86
release=2
version=2.87
release=1
source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.xz \
$name-config.patch dnsmasq)

View File

@ -1,6 +1,12 @@
<<<<<<< HEAD
diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.example
--- dnsmasq-2.86.orig/dnsmasq.conf.example 2022-02-16 15:33:26.622970564 +0100
+++ dnsmasq-2.86/dnsmasq.conf.example 2022-02-16 15:34:00.675532744 +0100
=======
diff -Nru dnsmasq-2.87.orig/dnsmasq.conf.example dnsmasq-2.87/dnsmasq.conf.example
--- dnsmasq-2.87.orig/dnsmasq.conf.example 2022-09-26 13:02:40.145014750 +0200
+++ dnsmasq-2.87/dnsmasq.conf.example 2022-09-26 13:02:54.071352953 +0200
>>>>>>> 0abfa391af2ddc9a13b1c97b59ec0c1e4bbe4a61
@@ -22,7 +22,7 @@
# Uncomment these to enable DNSSEC validation and caching:
@ -10,7 +16,7 @@ diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.examp
#dnssec
# Replies which are not DNSSEC signed may be legitimate, because the domain
@@ -96,8 +96,8 @@
@@ -106,8 +106,8 @@
# If you want dnsmasq to change uid and gid to something other
# than the default, edit the following lines.
@ -21,7 +27,7 @@ diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.examp
# If you want dnsmasq to listen for DHCP and DNS requests only on
# specified interfaces (and the loopback) give the name of the
@@ -535,7 +535,7 @@
@@ -545,7 +545,7 @@
# The DHCP server needs somewhere on disk to keep its lease database.
# This defaults to a sane location, but if you want to change it, use
# the line below.
@ -30,9 +36,15 @@ diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.examp
# Set the DHCP server to authoritative mode. In this mode it will barge in
# and take over the lease for any client which broadcasts on the network,
<<<<<<< HEAD
diff -Nru dnsmasq-2.86.orig/src/config.h dnsmasq-2.86/src/config.h
--- dnsmasq-2.86.orig/src/config.h 2022-02-16 15:33:26.626303822 +0100
+++ dnsmasq-2.86/src/config.h 2022-02-16 15:34:45.014534363 +0100
=======
diff -Nru dnsmasq-2.87.orig/src/config.h dnsmasq-2.87/src/config.h
--- dnsmasq-2.87.orig/src/config.h 2022-09-26 13:02:40.145014750 +0200
+++ dnsmasq-2.87/src/config.h 2022-09-26 13:02:54.071352953 +0200
>>>>>>> 0abfa391af2ddc9a13b1c97b59ec0c1e4bbe4a61
@@ -45,7 +45,7 @@
#define DEFLEASE 3600 /* default DHCPv4 lease time, one hour */
#define DEFLEASE6 (3600*24) /* default lease time for DHCPv6. One day. */
@ -42,7 +54,7 @@ diff -Nru dnsmasq-2.86.orig/src/config.h dnsmasq-2.86/src/config.h
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
#define LOG_MAX 5 /* log-queue length */
#define RANDFILE "/dev/urandom"
@@ -204,7 +204,7 @@
@@ -208,7 +208,7 @@
# elif defined(__ANDROID__)
# define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
# else

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/dM8U1XV1qOxb/cpjE54TypWdI2Oxz0BENt5yHWGPbluy2qVnWl1A+mGP7K40IqNYRf6VzEsfGCSZs8HwgOz2w4=
SHA256 (Pkgfile) = 3816e7be739ac155e84e29e4c19aa7a133ea3ddea5c99b759aa6380f6de00d50
RWSE3ohX2g5d/f18d04lS3v+Nzh5mFYY62o/pAGLktquVpBz9iG3BI96odkEiBzLWCPurjQveo0ALid6Ydl2twmDsYbSqt6a5gQ=
SHA256 (Pkgfile) = 0a4d332f1a36336bb4b52ed94e3383a15ea8b05f14d163f43783e7131f76a200
SHA256 (.footprint) = e8028e91cf5a718b826dc20d73172d4c8a227d5005d9628553e32d35d6d796f7
SHA256 (ImageMagick-7.1.0-48.tar.xz) = eb2d4dc3cc9fd3d4686aa64562177ca5067b1d40bcb6ec75fa1003eaf8c37f4e
SHA256 (ImageMagick-7.1.0-49.tar.xz) = ff55aabc66bb1e110979acc526287185188541ea265e796c2e4b1cb2d81b4ecf

View File

@ -4,7 +4,7 @@
# Depends on: libtool lcms2 pango xorg-libxt chrpath
name=imagemagick
version=7.1.0-48
version=7.1.0-49
release=1
source=(https://imagemagick.org/archive/releases/ImageMagick-$version.tar.xz)

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/ZJcbaITO2x9EPJYbR6U6WBuZuzwUBH905PufJcGNJjTZzgu/M1P4v592h07Cgb+yYB/OP1w4BYquG4Rc9u8OAA=
SHA256 (Pkgfile) = e3ec6eebbdfe3d6a601ad2bdc0c84f5ae48c3b728db2be2829a146105ad321d5
RWSE3ohX2g5d/dOzgTRW3KpTz5GtIEmMyCJ3iuqgCyZblyBACZ1hAAN9KntIOdvdNF0e/P4h2hLBnwJbXNLbugU6qXuKA12Xiwo=
SHA256 (Pkgfile) = 71658040ab6d8119259b96405311900a2f6fa962b6e11bb243ef04aec8fa8a95
SHA256 (.footprint) = 06b39e043d56a32e79bc658c4ff55db7bd7766762838a1983998f9dd2a93bb3c
SHA256 (newsboat-2.28.tar.xz) = 2508713ac850f1f2ae156e4b42cbc75a1c9e399d804e007b5773019115d3b0ec
SHA256 (newsboat.1.gz) = 85f55b4a1d5470afb03e7fa010bd12e12f698999ef1d21dff85917ad35d3254c
SHA256 (podboat.1.gz) = 9b9341975a3dd57d695c3e54ad91742794db7aaa415f30eecd29552d9722c52f
SHA256 (newsboat-2.29.tar.xz) = 18b9801e0c2948f29248bfd8f319a9f9f670993fdbd494c6464aaab9e325fd6b
SHA256 (newsboat.1.gz) = 547bde68c2a86492cafa1e92dbc35de06c5dd60c5194e323b523fd4b77d91a0a
SHA256 (podboat.1.gz) = 79062a9d988a8954779ef62421ad571f87b32177c19ff5d3e9ff0ca15842f046

View File

@ -4,7 +4,7 @@
# Depends on: curl libxml2 sqlite3 stfl json-c rust
name=newsboat
version=2.28
version=2.29
release=1
source=(https://newsboat.org/releases/$version/$name-$version.tar.xz
newsboat.1.gz podboat.1.gz)

Binary file not shown.

Binary file not shown.