Merge branch '3.5' into 3.6

Conflicts:
	python3-setuptools/.footprint
	python3-setuptools/.signature
This commit is contained in:
Juergen Daubert 2020-08-28 13:36:14 +00:00
commit 24ac1a657d
16 changed files with 49 additions and 38 deletions

View File

@ -6,6 +6,7 @@ drwxr-xr-x root/root etc/rc.d/
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/driverless -> ../lib/cups/driver/driverless
lrwxrwxrwx root/root usr/bin/driverless-fax -> ../lib/cups/driver/driverless-fax
lrwxrwxrwx root/root usr/bin/foomatic-rip -> ../lib/cups/filter/foomatic-rip
-rwxr-xr-x root/root usr/bin/ttfread
drwxr-xr-x root/root usr/include/
@ -29,11 +30,13 @@ drwxr-xr-x root/root usr/lib/cups/
drwxr-xr-x root/root usr/lib/cups/backend/
-rwxr-xr-x root/root usr/lib/cups/backend/beh
lrwxrwxrwx root/root usr/lib/cups/backend/driverless -> ../driver/driverless
lrwxrwxrwx root/root usr/lib/cups/backend/driverless-fax -> ../driver/driverless-fax
-rwx------ root/root usr/lib/cups/backend/implicitclass
-rwxr-xr-x root/root usr/lib/cups/backend/parallel
-rwxr-xr-x root/root usr/lib/cups/backend/serial
drwxr-xr-x root/root usr/lib/cups/driver/
-rwxr-xr-x root/root usr/lib/cups/driver/driverless
-rwxr-xr-x root/root usr/lib/cups/driver/driverless-fax
drwxr-xr-x root/root usr/lib/cups/filter/
-rwxr-xr-x root/root usr/lib/cups/filter/bannertopdf
-rwxr-xr-x root/root usr/lib/cups/filter/commandtoescpx

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/dZN5C6rfS56gv/d7nnEqyYorTIYoYeCHlfk/aqWeaI0wjulR3+tBuK7pXn1BFLDbva3NQrYlu1FVqHh0qcVhAk=
SHA256 (Pkgfile) = 0c7e52850aaeee684994365377c46b7412318ebfe8dc7923c50dffc3baf4414b
SHA256 (.footprint) = 375c4263f14bb0430351dc9e79fe7197f17a5c611c001e23edae174bed640f5e
SHA256 (cups-filters-1.27.5.tar.xz) = a166ff60a56ef7c19df93129fb79b31ffadb4de32b26fc6b1ce03b75a016559e
RWSE3ohX2g5d/WX5uIl21FXk27FLo8peS5bZ7ILs3kdR9seC8yl5fBtUUANQXbuNlWjahcQF0mbRzr2Xae/7UV025bvboPsPJwc=
SHA256 (Pkgfile) = c05b0bf61f57a8d6ab7397bd963420488b120abddab4919c74d348bb5e57a5d2
SHA256 (.footprint) = b59bc7c325fffa9f830516e4474315e424179dcb304918829ff278b6083deb19
SHA256 (cups-filters-1.28.1.tar.xz) = 6357ab2e6ead8598b1923f6ee53a9fc227043b3701e3151abe6f83bbfa9f1ea8
SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b

View File

@ -4,7 +4,7 @@
# Depends on: ghostscript poppler qpdf mupdf xorg-font-dejavu-ttf
name=cups-filters
version=1.27.5
version=1.28.1
release=1
source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz
cups-browsed)

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/b9jB3XLn9Zxbm3RuJZJ5kSxU6NfdaAc2ACdC8LHAUKVJl/NuHe1mzcvGb25/cvzGk73R0Xf9jwCtG5rvObJjAM=
SHA256 (Pkgfile) = df1b9eda4a97c238f629d0ee241ab5c1631bb1ad617a3c6bb5a3db65c882414a
RWSE3ohX2g5d/VEL464MNHGIv6gAOxazMECHhHG6unGoPdD9GLXVl5MUZybjLyRpw09OQNaiE9hE+oITmUlpxYxC3zT0GkzlEQk=
SHA256 (Pkgfile) = 90d591c0736cb448214ec48b5987768fa2dfe0f351f756045ed2f65bfa719906
SHA256 (.footprint) = c52f9b61b3ffbab88aa941546c7721245d6c825056bd4948b84b94966203996d
SHA256 (fetchmail-6.4.8.tar.xz) = 26cd936ece146e056cdf79a676a33738b4eab0a5ae2edf3fce5ba034721b09bd
SHA256 (fetchmail-6.4.10.tar.xz) = dbbefd43b8a8ac0517b817fdb63629d321e53fd63143b92d117bbd7d91d7b25e

View File

@ -4,7 +4,7 @@
# Depends on: openssl
name=fetchmail
version=6.4.8
version=6.4.10
release=1
source=(https://downloads.sourceforge.net/project/$name/branch_${version%.*}/$name-$version.tar.xz)

View File

@ -10,6 +10,7 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/gpgparsemail
-rwxr-xr-x root/root usr/bin/gpgscm
-rwxr-xr-x root/root usr/bin/gpgsm
-rwxr-xr-x root/root usr/bin/gpgsplit
-rwxr-xr-x root/root usr/bin/gpgtar
-rwxr-xr-x root/root usr/bin/gpgv
-rwxr-xr-x root/root usr/bin/kbxutil

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bVJxKHcSF8cCu5P6La1D7tgztdEW2xZ6CWAqxmen+qBTWOmeghr19GmFwy2OzCrByiRsGCbPZ4Pczss2zIHzAw=
SHA256 (Pkgfile) = da343a816620c073bea96028c3f8bbb3e9f95ddf36faf8ad56a5e527ae7db360
SHA256 (.footprint) = fb5e64bd2babafc327c4672450ca00fb92cd98c0a80e4caa42ff1e60f67c1676
SHA256 (gnupg-2.2.21.tar.bz2) = 61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec
RWSE3ohX2g5d/fvuxhmYmMKXlXlPkGE6cLLCm11FF6/rOdaobRQK2VNAUNy1MQ/GP0nuwKFWdcRb+1GieJyVgzs4fatzEdhlcws=
SHA256 (Pkgfile) = afd676716c38a1dbae526580cae0502e4932e5a50fb80dae6998128928fd0f5f
SHA256 (.footprint) = f372bf9ed1f25d9f062d71eb3d7d7d1e32d8a3e2554e09894ebb30e9d1a2f1e9
SHA256 (gnupg-2.2.22.tar.bz2) = 7c1370565e1910b9d8c4e0fb57b9de34aa062ec7bb91abad5803d791f38d855b

View File

@ -4,7 +4,7 @@
# Depends on: libgcrypt, libksba, pinentry, npth
name=gnupg
version=2.2.21
version=2.2.22
release=1
source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)

View File

@ -10,9 +10,9 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libgpg-error.a
-rwxr-xr-x root/root usr/lib/libgpg-error.la
lrwxrwxrwx root/root usr/lib/libgpg-error.so -> libgpg-error.so.0.29.0
lrwxrwxrwx root/root usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.29.0
-rwxr-xr-x root/root usr/lib/libgpg-error.so.0.29.0
lrwxrwxrwx root/root usr/lib/libgpg-error.so -> libgpg-error.so.0.30.0
lrwxrwxrwx root/root usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.30.0
-rwxr-xr-x root/root usr/lib/libgpg-error.so.0.30.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gpg-error.pc
drwxr-xr-x root/root usr/share/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RdCyuc8nBNTD7R8/kpJNxvUkg3n53pUkG7/mP3Fy+1riFebVgH2fHIoR1ywNZ53ALooBJmO+asyhNSs3lfOLwk=
SHA256 (Pkgfile) = b6f62889c5845fa7aadfc119a5ccd2147e592ae301e45404d572aee52c4b5c39
SHA256 (.footprint) = e829ba922bb6dbe9d5d8ac0447eabf1f8a79cd206b63e9dd3fdb14d62f834d95
SHA256 (libgpg-error-1.38.tar.bz2) = d8988275aa69d7149f931c10442e9e34c0242674249e171592b430ff7b3afd02
RWSE3ohX2g5d/VyFWqnBBLrDQ2ciBEu/AkEDGVTAg6e8niLJaNNq9mCm6uoyNW2YXiTBSSD5rZfDPv1XTlncyl+q1q1Mrh/gnQA=
SHA256 (Pkgfile) = 90357f2b070ca777dfe3e093a0f24632ac1dbc220cb8103f4f222d702a5857f6
SHA256 (.footprint) = cbfd8d18344843a726620830bcc88c3452e87807e895eb35e0fc73136fce1ac3
SHA256 (libgpg-error-1.39.tar.bz2) = 4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f

View File

@ -3,7 +3,7 @@
# Maintainer: Thomas Penteker, tek at serverop dot de
name=libgpg-error
version=1.38
version=1.39
release=1
source=(https://www.gnupg.org/ftp/gcrypt/$name/$name-$version.tar.bz2)

View File

@ -73,14 +73,14 @@ drwxr-xr-x root/root usr/lib/python3.8/site-packages/pkg_resources/extern/
drwxr-xr-x root/root usr/lib/python3.8/site-packages/pkg_resources/extern/__pycache__/
-rw-r--r-- root/root usr/lib/python3.8/site-packages/pkg_resources/extern/__pycache__/__init__.cpython-38.opt-1.pyc
-rw-r--r-- root/root usr/lib/python3.8/site-packages/pkg_resources/extern/__pycache__/__init__.cpython-38.pyc
drwxr-xr-x root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/top_level.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0.post20200823-py3.8.egg-info/zip-safe
drwxr-xr-x root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/top_level.txt
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools-50.0.0-py3.8.egg-info/zip-safe
drwxr-xr-x root/root usr/lib/python3.8/site-packages/setuptools/
-rw-r--r-- root/root usr/lib/python3.8/site-packages/setuptools/__init__.py
drwxr-xr-x root/root usr/lib/python3.8/site-packages/setuptools/__pycache__/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bmgsvS+rR1ShmKlXn6KNIeLe7J4mCBw4ajsv7/Gu5IJ1f5xtvstwjbW1Xai24/VcgRGi38a5TcMgN69TJTsuQE=
SHA256 (Pkgfile) = 4dc96f9d0dcf35ddbb00b20d36ba005421dabfcd6a0fd8dd8a82ec27a727ccec
SHA256 (.footprint) = 0b01b57420d215e3549238e9a1a37c48f1ce3ca41ff06e0622fd186493627f3b
RWSE3ohX2g5d/Z6UxHzw4PMvsEHaP70YHoqjIR2ZBUWdCVkOxdKPlQMOoCDg1Ve9CZcQFMiVwL6J8TnQ71W7YIA1QSzoU2mOQwQ=
SHA256 (Pkgfile) = bf5b9010978494b704ef1b27e026e0034942bc4aa328a2bacd0f0c5b9d55da2c
SHA256 (.footprint) = 9de7bfe5d695a3746564881c7c938cc93d6e480c7eb2b01e4cfda118146b1f6c
SHA256 (setuptools-v50.0.0.tar.gz) = 9620483543689ddb8318c3cd112b9f1ded76792aabd71240df0d9352d5aa9258

View File

@ -4,7 +4,7 @@
name=python3-setuptools
version=50.0.0
release=1
release=2
source=(https://github.com/pypa/${name#*-}/archive/v$version/${name#*-}-v$version.tar.gz)
build() {
@ -19,4 +19,11 @@ build() {
--prefix=/usr --root=$PKG --optimize=1
rm $PKG/usr/bin/easy_install
# wtf?
(
local pyver3="$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])')"
cd $PKG/usr/lib/python$pyver3/site-packages
mv setuptools-$version*-py$pyver3.egg-info setuptools-$version-py$pyver3.egg-info
)
}

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/fXKflfHhQPGkrrme9LEg+ltk0tadiuv/5kwrHqX9WxZLmX2pX7v2L3xJpR8uR0uTI4gkK2ZATDTT9Tr5oEyoww=
SHA256 (Pkgfile) = 0916f10f8dc9f72e2a2d7704c8d60ea232432cd5cbb7b2954826d9d6d5054b10
RWSE3ohX2g5d/aNmQ01NrSEl8ZguwKkEB1MuhCSIiOzH4m3fUGPXNkFLKHEU0J+pDLwX3dskMsrGNoRFRqVFCF19SmQ2Wh+4aAE=
SHA256 (Pkgfile) = 19ab21ddf9cdda845a28df3a9024235fa20d0bb081a727d6259be2d90c8ae79e
SHA256 (.footprint) = 2c2ccf7d49397243b0e18693bdeffa6442a1afc9050cadd41e348c09a7cc5cde
SHA256 (rsyslog-8.2006.0.tar.gz) = d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97
SHA256 (rsyslog-8.2008.0.tar.gz) = 09d2b6c8bc2f016598aed2bb719e03f822bb01d720c61e4d6e725e00dca1b650
SHA256 (rsyslog.conf) = 4d671bb3b183e7acbacb9d7b92447cfe1e446ed85b44eff76a8d1c70fe5f08c2
SHA256 (rsyslogd.rc) = d28d8c3fc8076b10156f9b60c7e4af5909c312beddcd67c62f8b6153594065c0

View File

@ -4,7 +4,7 @@
# Depends on: libestr json-c libgcrypt liblogging libfastjson
name=rsyslog
version=8.2006.0
version=8.2008.0
release=1
source=(http://www.rsyslog.com/files/download/$name/$name-$version.tar.gz \
$name.conf rsyslogd.rc)