From 3384f870edce0812abb709f5e7bf36c7fd68f35c Mon Sep 17 00:00:00 2001 From: joborun Date: Thu, 5 Oct 2023 21:34:40 +0300 Subject: [PATCH] upg gettext openssh --- eudev/eudev-3.2.12-sticky-tags.patch | 126 +++++++++++++++++++++++++++ gettext/PKGBUILD | 10 +-- gettext/PKGBUILD-arch | 6 +- openssh/PKGBUILD | 14 +-- openssh/PKGBUILD-arch | 12 +-- 5 files changed, 147 insertions(+), 21 deletions(-) create mode 100644 eudev/eudev-3.2.12-sticky-tags.patch diff --git a/eudev/eudev-3.2.12-sticky-tags.patch b/eudev/eudev-3.2.12-sticky-tags.patch new file mode 100644 index 0000000..05ef0db --- /dev/null +++ b/eudev/eudev-3.2.12-sticky-tags.patch @@ -0,0 +1,126 @@ +https://github.com/eudev-project/eudev/issues/249 +https://github.com/eudev-project/eudev/pull/253 +https://github.com/eudev-project/eudev/commit/c5bae0b656513463f92808f324f8fcbe34a0b401 + +From 7d2123ead5a15d4b2aff70eafc6f7b9b2f6527ac Mon Sep 17 00:00:00 2001 +From: Boian Bonev +Date: Fri, 11 Aug 2023 22:08:27 +0000 +Subject: [PATCH 1/3] Bump udev version to 251 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3e31b0ebc..069fdfb87 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + AC_PREREQ([2.68]) + AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) +-AC_SUBST(UDEV_VERSION, 243) ++AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + + AC_USE_SYSTEM_EXTENSIONS + +From dacff83d872c1dcb563439f98c9b974e244fcd46 Mon Sep 17 00:00:00 2001 +From: Boian Bonev +Date: Fri, 11 Aug 2023 23:14:02 +0000 +Subject: [PATCH 2/3] Export dummies for + + - udev_device_has_current_tag + - udev_device_get_current_tags_list_entry + +since the current eudev device database does not support the concept of +current tags +--- + src/libudev/libudev-device.c | 11 +++++++++++ + src/libudev/libudev.h | 2 ++ + src/libudev/libudev.sym | 6 ++++++ + 3 files changed, 19 insertions(+) + +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index ac67ce846..7d7a6622e 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev + return udev_list_get_entry(&udev_device->tags_list); + } + ++_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device) ++{ ++ // TODO: eudev database does not support current tags ++ return udev_device_get_tags_list_entry(udev_device); ++} ++ + /** + * udev_device_has_tag: + * @udev_device: udev device +@@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta + return false; + } + ++_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) { ++ // TODO: eudev database does not support current tags ++ return udev_device_has_tag(udev_device, tag); ++} ++ + #define ENVP_SIZE 128 + #define MONITOR_BUF_SIZE 4096 + static int update_envp_monitor_buf(struct udev_device *udev_device) +diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h +index 8491d2b81..0202964d6 100644 +--- a/src/libudev/libudev.h ++++ b/src/libudev/libudev.h +@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device); ++struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device); + struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device); + const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key); + const char *udev_device_get_driver(struct udev_device *udev_device); +@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device + const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr); + int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value); + int udev_device_has_tag(struct udev_device *udev_device, const char *tag); ++int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag); + + /* + * udev_monitor +diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym +index 76726fca7..d56c2aeab 100644 +--- a/src/libudev/libudev.sym ++++ b/src/libudev/libudev.sym +@@ -118,3 +118,9 @@ global: + udev_queue_flush; + udev_queue_get_fd; + } LIBUDEV_199; ++ ++LIBUDEV_247 { ++global: ++ udev_device_has_current_tag; ++ udev_device_get_current_tags_list_entry; ++} LIBUDEV_215; + +From df220edbc585d2e7a08ed8ad90770fefd0e60bb5 Mon Sep 17 00:00:00 2001 +From: Boian Bonev +Date: Fri, 11 Aug 2023 23:16:10 +0000 +Subject: [PATCH 3/3] bump version to 3.2.14 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 069fdfb87..0d9a135bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_PREREQ([2.68]) +-AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues]) ++AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues]) + AC_SUBST(UDEV_VERSION, 251) + AC_CONFIG_SRCDIR([src/udev/udevd.c]) + diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD index f5e0afb..644fcf8 100644 --- a/gettext/PKGBUILD +++ b/gettext/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gettext -pkgver=0.22.2 +pkgver=0.22.3 pkgrel=01 pkgdesc="GNU internationalization library" url="https://www.gnu.org/software/gettext/" @@ -59,14 +59,14 @@ package() { arch=(x86_64) -license=(GPL) +license=('GPL-2.0-only' 'LGPL-2.0-only' 'GFDL-1.2-only' 'GPL-2.0-or-later') validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno '68D94D8AAEEAD48AE7DC5B904F494A942E4616C2' '9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development) -sha256sums=(a99662bafc1cc683ec7740844b465c7f30ccb044967f157f74697df9a9306b0e # gettext-0.22.2.tar.gz - c44ba5d822569b52facee3440960f95a6bc9effeb919ba520b8271fe87cf3ae1 # gettext-0.22.2.tar.gz.sig +sha256sums=(839a260b2314ba66274dae7d245ec19fce190a3aa67869bf31354cb558df42c7 # gettext-0.22.3.tar.gz + 18fffe93702404cb4c5c5f2e0f128577d30b770cec89c810a2ce12eb464057e4 # gettext-0.22.3.tar.gz.sig a28a27192f336f0b0908bdbf840d3b19d7b587c4ac52cad635cb43e95eb3c78d) # gettext-0.22.2-disable-libtextstyle.patch -## cdc49925fcd8983264bb62b932967f00edbc628657afa82594ef4ab3d8675075 gettext-0.22.2-01-x86_64.pkg.tar.lz +## 7b5444b267d99e06e07fe8bee8d0e735e2708a011366d5a33791dc4e780354e5 gettext-0.22.3-01-x86_64.pkg.tar.lz diff --git a/gettext/PKGBUILD-arch b/gettext/PKGBUILD-arch index 7fa9b87..e28fbdc 100644 --- a/gettext/PKGBUILD-arch +++ b/gettext/PKGBUILD-arch @@ -1,19 +1,19 @@ # Maintainer: pkgname=gettext -pkgver=0.22.2 +pkgver=0.22.3 pkgrel=1 pkgdesc="GNU internationalization library" url="https://www.gnu.org/software/gettext/" arch=(x86_64) -license=(GPL) +license=('GPL-2.0-only' 'LGPL-2.0-only' 'GFDL-1.2-only' 'GPL-2.0-or-later') depends=(gcc-libs acl sh libunistring libxml2) makedepends=(gettext emacs git) optdepends=('git: for autopoint infrastructure updates') options=(!docs) source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig} gettext-0.22-disable-libtextstyle.patch) -sha256sums=('a99662bafc1cc683ec7740844b465c7f30ccb044967f157f74697df9a9306b0e' +sha256sums=('839a260b2314ba66274dae7d245ec19fce190a3aa67869bf31354cb558df42c7' 'SKIP' 'a28a27192f336f0b0908bdbf840d3b19d7b587c4ac52cad635cb43e95eb3c78d') validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno diff --git a/openssh/PKGBUILD b/openssh/PKGBUILD index 812fe0d..211fbc1 100644 --- a/openssh/PKGBUILD +++ b/openssh/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=openssh -pkgver=9.4p1 -pkgrel=04 +pkgver=9.5p1 +pkgrel=01 pkgdesc='SSH protocol implementation for remote login, command execution and file transfer w/o systemd' url='https://www.openssh.com/portable.html' depends=( 'glibc' @@ -77,7 +77,8 @@ build() { --with-xauth=/usr/bin/xauth \ --with-pid-dir=/run \ --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/bin' \ - --without-zlib-version-check + --without-zlib-version-check \ + --without-systemd make } @@ -120,11 +121,10 @@ license=(BSD-2-Clause validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # "Damien Miller " -sha256sums=(3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85 # openssh-9.4p1.tar.gz - d92592d82bee81745a71bbf249ede02afcdbf933f0de18841a7f17b15b975a03 # openssh-9.4p1.tar.gz.asc +sha256sums=(f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b # openssh-9.5p1.tar.gz + 88d3935af9dc82fcb34f5c7c7f226e6b750c0859452b691166be0d626d471d31 # openssh-9.5p1.tar.gz.asc 78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30 # 99-archlinux.conf 76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327 # sshd.conf 64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846) # sshd.pam -## df0d4ca1c827d67eb4d0bbff1c7af6b974bc83b9fec63f43cfe7c929cabe2a2b openssh-9.4p1-04-x86_64.pkg.tar.lz - +## 1d63b4c7746a76803446b0a1567ef09a7bd35c19532a278d6655ecc3a18a6142 openssh-9.5p1-01-x86_64.pkg.tar.lz diff --git a/openssh/PKGBUILD-arch b/openssh/PKGBUILD-arch index 1b529ea..326efb6 100644 --- a/openssh/PKGBUILD-arch +++ b/openssh/PKGBUILD-arch @@ -5,8 +5,8 @@ # Contributor: judd pkgname=openssh -pkgver=9.4p1 -pkgrel=4 +pkgver=9.5p1 +pkgrel=1 pkgdesc="SSH protocol implementation for remote login, command execution and file transfer" arch=(x86_64) url='https://www.openssh.com/portable.html' @@ -50,22 +50,22 @@ source=( sshd.conf sshd.pam ) -sha256sums=('3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85' +sha256sums=('f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b' 'SKIP' '78b806c38bc1e246daaa941bfe7880e6eb6f53f093bea5d5868525ae6d223d30' 'e5305767b2d317183ad1c5022a5f6705bd9014a8b22495a000fd482713738611' 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' 'b3b1e4f7af169cd5fccdcdf9538ef37fc919c79a9905f797925153a94e723998' '76635a91526ce44571485e292e3a777ded6a439af78cb93514b999f91fb9b327' - '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846') -b2sums=('d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53' + '633e24cbfcb045ba777d3e06d5f85dfaa06d44f4727d38c7fb2187c57498221d') +b2sums=('55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796' 'SKIP' '1ff8cd4ae22efed2b4260f1e518de919c4b290be4e0b5edbc8e2225ffe63788678d1961e6f863b85974c4697428ee827bcbabad371cfc91cc8b36eae9402eb97' '09fad3648f48f13ee80195b90913feeba21240d121b1178e0ce62f4a17b1f7e58e8edc22c04403e377ab300f5022a804c848f5be132765d5ca26a38aab262e50' '07ad5c7fb557411a6646ff6830bc9d564c07cbddc4ce819641d31c05dbdf677bfd8a99907cf529a7ee383b8c250936a6423f4b4b97ba0f1c14f627bbd629bd4e' '046ea6bd6aa00440991e5f7998db33864a7baa353ec6071f96a3ccb5cca5b548cb9e75f9dee56022ca39daa977d18452851d91e6ba36a66028b84b375ded9bc5' 'a3fd8f00430168f03dcbc4a5768ed788dd43140e365a882b601510f53f69704da04f24660157bb8a43125f5389528993732d99569d77d5f3358074e7ae36d4ca' - '557d015bca7008ce824111f235da67b7e0051a693aaab666e97b78e753ed7928b72274af03d7fde12033986b733d5f996faf2a4feb6ecf53f39accae31334930') + '1d24cc029eccf71cee54dda84371cf9aa8d805433e751575ab237df654055dd869024b50facd8b73390717e63100c76bca28b493e0c8be9791c76a2e0d60990a') validpgpkeys=('7168B983815A5EEF59A4ADFD2A3F414E736060BA') # Damien Miller prepare() {