diff --git a/jobo-setup/PKGBUILD b/jobo-setup/PKGBUILD index 9a88eb9..77d2fad 100644 --- a/jobo-setup/PKGBUILD +++ b/jobo-setup/PKGBUILD @@ -9,7 +9,7 @@ pkgname=jobo-setup pkgdesc='Post Install joborun setup script - The script will not alter your system, you will!' pkgver=0.6 -pkgrel=02 +pkgrel=03 groups=(base) source=( 'README.txt' '66.setup' @@ -64,8 +64,8 @@ sha256sums=(5c57b7e372ce103afa24acfd4479a85c80c6980e06d580d5bee6c6b3f24174ab # 50be5dceaa457ab523ffac933852f5f2e4af9ab8589961e46b2309568c55a0bf # X.list e3ebae67ce2be67beef600532e816078a9ff8c6fc777ca77c6ab728feb08aa9a # install.labwc 088763058d11eaf9c46ab4819ba6ce7cf2585c3190c7a076981ce057b5ebb2c2 # remove.labwc - a681d046cb965d317b7c792e494af9df309621a0dacffa2b890c6fc6dc41a8a0 # labwc.list + 4835a7bba02c405672aeac6aeed860518bcad9c59f88eea91b9dec7cd6e71b0f # labwc.list 981716977ddb54d9b5c7e965a555336250bac40dc9816698007ac9407cb49e78) # add-gfx -## a2ee20b77048a4a01b00caa0a17ce6c72131474cb5e6ea73e403c282eff2f90f jobo-setup-0.6-02-x86_64.pkg.tar.lz +## d00777b151ab7fa34ccd0ac073fd3f8836c6cfb17a88e2b5fe3918830620ec48 jobo-setup-0.6-03-x86_64.pkg.tar.lz diff --git a/jobo-setup/labwc.list b/jobo-setup/labwc.list index 56e897e..349f35b 100644 --- a/jobo-setup/labwc.list +++ b/jobo-setup/labwc.list @@ -1,24 +1,24 @@ -labwc +labwc-git seatd -wlroots -wlroots0.16 swaybg wapanel +sfwbar wlr-randr conky11 -sakura-gtk2 -pcmanfm-gtk2 +foot +lxterminal +sakura +pcmanfm swayidle elinks -feh leafpad +labwc-tweaks +nwg-look labwc-menu-generator xdg-user-dirs pam_rundir gmrun -nwg-look package-query pacman-contrib startup-notification volumeicon -sfwbar diff --git a/nss/PKGBUILD b/nss/PKGBUILD index 25e578d..d263172 100644 --- a/nss/PKGBUILD +++ b/nss/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) -pkgver=3.102 +pkgver=3.102.1 pkgrel=01 pkgdesc="Network Security Services - zstd mandatory here!" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -105,14 +105,14 @@ arch=(x86_64) license=(MPL-2.0) -b2sums=('66366090d0bfa278b6d9c41a8b1c4daafb7c9e1c2e127160e09341879100a4dc054fdde4c40653cadc7b8b78934869528993f04173279e76d8606a9c82edfb4b' +b2sums=('6faf6f6d1658d39992ac920b5ba5ba2c8aa63e9092482942563dfc2456f083ecdfd02d0673164d86b023801784e500437b84970199bcabff51e90286d456d2fb' '4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6' '6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510') -sha256sums=(c4b5a742a727b4645058a2b711c3e22762a999190f6713c3f89ec52a27834cf9 # nss 3.102 +sha256sums=(d300fa2f7adce4a1653e528f3aaf3ab765f7ce7a3e5cdc803c25338b56b15fa1 # nss 3.102.1 3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd # bundle.sh d2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c) # certdata2pem.py -## d7caf34c48693b36d9b7bf3418f6beb03fc284193c47f766fa462b4727ddd96c ca-certificates-mozilla-3.102-01-x86_64.pkg.tar.lz -## 753966739cceb17ab92605e6d8f45a39bd8390343f761e120be24e30fa63e4e9 nss-3.102-01-x86_64.pkg.tar.lz +## 6fbb20d0a0453b1abc24a5201e2fd69176273d2c891e9b6ab1b35f90f82d3942 ca-certificates-mozilla-3.102.1-01-x86_64.pkg.tar.lz +## 71700fb9cda9571d0630e6bd7e92b1ca3ca74414f91e52cabd21eafe52643284 nss-3.102.1-01-x86_64.pkg.tar.lz diff --git a/nss/PKGBUILD-arch b/nss/PKGBUILD-arch index ddfb680..30ca342 100644 --- a/nss/PKGBUILD-arch +++ b/nss/PKGBUILD-arch @@ -6,7 +6,7 @@ pkgname=( nss ca-certificates-mozilla ) -pkgver=3.102 +pkgver=3.102.1 pkgrel=1 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -32,7 +32,7 @@ source=( bundle.sh certdata2pem.py ) -b2sums=('66366090d0bfa278b6d9c41a8b1c4daafb7c9e1c2e127160e09341879100a4dc054fdde4c40653cadc7b8b78934869528993f04173279e76d8606a9c82edfb4b' +b2sums=('6faf6f6d1658d39992ac920b5ba5ba2c8aa63e9092482942563dfc2456f083ecdfd02d0673164d86b023801784e500437b84970199bcabff51e90286d456d2fb' '4be5dd836c844fdd7b63302a6994d62149082c3bc81eef70f373f416fed80a61a923960e4390d1c391b81ab01b409370d788818a30ffdd3a4ed467b670f990f6' '6bb59dcc9289916dcbf8fb6d73db0c0cd7582dc12a3aa4e8be19ec62c9ede65fdd9470a2d92ec5a114506b78d2d21b8ae0a1b45a17dc1f90f7d75434a93da510') diff --git a/nss/deps b/nss/deps index bc409cb..942c498 100644 --- a/nss/deps +++ b/nss/deps @@ -3,4 +3,3 @@ python gyp mercurial - diff --git a/wpa_supplicant/0007-nl80211-add-extra-ies-only-if-allowed-by-driver.patch b/wpa_supplicant/0007-nl80211-add-extra-ies-only-if-allowed-by-driver.patch index a67ad5f..88f99d9 100644 --- a/wpa_supplicant/0007-nl80211-add-extra-ies-only-if-allowed-by-driver.patch +++ b/wpa_supplicant/0007-nl80211-add-extra-ies-only-if-allowed-by-driver.patch @@ -30,10 +30,10 @@ Origin: http://lists.infradead.org/pipermail/hostap/2022-January/040185.html 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver.h b/src/drivers/driver.h -index d3312a34d8f8..b5b626451ffd 100644 +index 4331782d897a..243e9b5cc4d8 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h -@@ -2052,6 +2052,9 @@ struct wpa_driver_capa { +@@ -2357,6 +2357,9 @@ struct wpa_driver_capa { /** Maximum number of iterations in a single scan plan */ u32 max_sched_scan_plan_iterations; @@ -44,10 +44,10 @@ index d3312a34d8f8..b5b626451ffd 100644 int sched_scan_supported; diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c -index 83868b78e6f0..b33b6badb13e 100644 +index 26c1f41406d2..d5ba66b1073e 100644 --- a/src/drivers/driver_nl80211_capa.c +++ b/src/drivers/driver_nl80211_capa.c -@@ -885,6 +885,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg) +@@ -976,6 +976,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg) nla_get_u32(tb[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]); } @@ -59,10 +59,10 @@ index 83868b78e6f0..b33b6badb13e 100644 capa->max_match_sets = nla_get_u8(tb[NL80211_ATTR_MAX_MATCH_SETS]); diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c -index 1316084805a3..b0f095192714 100644 +index b055e684a9f8..a8ea8f2cf1d7 100644 --- a/src/drivers/driver_nl80211_scan.c +++ b/src/drivers/driver_nl80211_scan.c -@@ -207,7 +207,7 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd, +@@ -221,7 +221,7 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd, wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested"); } diff --git a/wpa_supplicant/PKGBUILD b/wpa_supplicant/PKGBUILD index 92f6140..a1b3482 100644 --- a/wpa_supplicant/PKGBUILD +++ b/wpa_supplicant/PKGBUILD @@ -7,26 +7,25 @@ pkgname=wpa_supplicant pkgver=2.11 -pkgrel=01 +pkgrel=02 epoch=2 pkgdesc='A utility providing key negotiation for WPA wireless networks' url='https://w1.fi/wpa_supplicant/' depends=(openssl libdbus readline libnl pcsclite) makedepends=(docbook-sgml docbook-utils git perl-sgmls) install=wpa_supplicant.install -source=( - "git+https://w1.fi/hostap.git?signed#tag=hostap_${pkgver//./_}" #https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz{,.asc} +source=("git+https://w1.fi/hostap.git?signed#tag=hostap_${pkgver//./_}" wpa_supplicant_config # More permissive TLS fallback 0001-Enable-TLSv1.0-by-default.patch - # https://salsa.debian.org/debian/wpa/-/commit/13e1d28e4f987a220c546df94df86bb9b2371874 0002-Disable-Werror-for-eapol_test.patch - # https://lists.infradead.org/pipermail/hostap/2022-May/040511.html # https://bugs.archlinux.org/task/76474 - 0003-Allow-legacy-renegotiation-to-fix-PEAP-issues-with-s.patch) + 0003-Allow-legacy-renegotiation-to-fix-PEAP-issues-with-s.patch + # https://lists.infradead.org/pipermail/hostap/2022-January/040178.html + 0007-nl80211-add-extra-ies-only-if-allowed-by-driver.patch) prepare() { cd hostap @@ -96,12 +95,15 @@ b2sums=('163d2e6644902f36b3b5f25e328221fa34495d745801e8d3dce874b05366c81370ef75c '9785af24e59e3d48dc3ab055cc6b9e5bbf081e801fbbfa70d532c2ad8f7f4e59c2679385c75aa02f856ec387cd5182640ff91d892aed9846c738da57e05574d9' '96b82aaa5315e931424150d47e52f70186e2eea3928a5c97792473b69e8f92463863e8044e073bf940d597a3620f63381bd6996a594c85977785cdce4038f768' 'bd00e0f6c04db9c2dc274763b97dace4d886fb105b0a605bb15877ee84e4a93a7b95ab9a0242b4937c748c8e7991e3dddb795ac4c2b0e99be0f5e48098041b70' - 'aaa7604faf1fede451582c8b981579cc86724a66c783d8368d1c122e0c381b75842d83bd85a982c1d4461d65bc74e62d34768762d15b4005a24a17e1392a109a') + 'aaa7604faf1fede451582c8b981579cc86724a66c783d8368d1c122e0c381b75842d83bd85a982c1d4461d65bc74e62d34768762d15b4005a24a17e1392a109a' + '28bf078147cc2f3395d3f907d6d900c7976dbd9948a9513f1d7ef32a40b89fee55e243c9302d24eda62dc1f813857fa09ae79e6faf52881e463a163acb437380') -sha256sums=('03e3c14c20a89f8978b831fe08d98e6083c058083707871d480553135c109584' - '1e32af4a1a147ee75358fd0b5636fb41332a7b91ec7a904292178256f735e9d2' - 'd5b5ca3a468352747e19c4b597ec090b46e08dec4e18de82aea62812b8bdeaae' - '7c2f3d0123dab97268275702d04e6db7de4ad6b7e8101b82d4f8fd23d0ab9b29' - 'dce0190b0dd2d55de45ec93a57175ddcd1d10cb8e0a45c75a2dd8802ada989b1') +sha256sums=(03e3c14c20a89f8978b831fe08d98e6083c058083707871d480553135c109584 # hostap + 1e32af4a1a147ee75358fd0b5636fb41332a7b91ec7a904292178256f735e9d2 # wpa_supplicant_config + d5b5ca3a468352747e19c4b597ec090b46e08dec4e18de82aea62812b8bdeaae # 0001-Enable-TLSv1.0-by-default.patch + 7c2f3d0123dab97268275702d04e6db7de4ad6b7e8101b82d4f8fd23d0ab9b29 # 0002-Disable-Werror-for-eapol_test.patch + dce0190b0dd2d55de45ec93a57175ddcd1d10cb8e0a45c75a2dd8802ada989b1 # 0003-Allow-legacy-renegotiation-to-fix-PEAP-issues-with-s.patch + 12f9e3177b6fbe390eda5c97a41768e8c9474ec4b66d9c7a5c5939d993029f97) # 0007-nl80211-add-extra-ies-only-if-allowed-by-driver.patch + +## 0a621e94173710b89beb4263cc13df7b6ca6c1edb3ac01a63246812d287bb66c wpa_supplicant-2_2.11-02-x86_64.pkg.tar.lz -## 0597c87da734584864805ed4cd358d24d59bc1275d5b17ddfb05fbb053aa3874 wpa_supplicant-2_2.11-01-x86_64.pkg.tar.lz diff --git a/wpa_supplicant/PKGBUILD-arch b/wpa_supplicant/PKGBUILD-arch index 5299098..6d2bb07 100644 --- a/wpa_supplicant/PKGBUILD-arch +++ b/wpa_supplicant/PKGBUILD-arch @@ -5,7 +5,7 @@ pkgname=wpa_supplicant pkgver=2.11 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc='A utility providing key negotiation for WPA wireless networks' url='https://w1.fi/wpa_supplicant/' @@ -46,6 +46,9 @@ source=( # More unit improvements from Debian 0006-Add-reload-support-to-the-systemd-unit-files.patch + + # https://lists.infradead.org/pipermail/hostap/2022-January/040178.html + 0007-nl80211-add-extra-ies-only-if-allowed-by-driver.patch ) b2sums=('163d2e6644902f36b3b5f25e328221fa34495d745801e8d3dce874b05366c81370ef75c8f7e0198e206a3d04c5ea4bb501bf97693fa481e15cf5067d80ab0c1e' '9785af24e59e3d48dc3ab055cc6b9e5bbf081e801fbbfa70d532c2ad8f7f4e59c2679385c75aa02f856ec387cd5182640ff91d892aed9846c738da57e05574d9' @@ -54,7 +57,8 @@ b2sums=('163d2e6644902f36b3b5f25e328221fa34495d745801e8d3dce874b05366c81370ef75c 'aaa7604faf1fede451582c8b981579cc86724a66c783d8368d1c122e0c381b75842d83bd85a982c1d4461d65bc74e62d34768762d15b4005a24a17e1392a109a' '7175e7aab682370aef1b3358eaa839dcb009e12940aa2b9949c8c3254406341433e84af09d09ad670bf41f5201d979af02095c87a368b76465a952b1be9de049' '6472d571f18c3ee718315888b9c756c4579a4b411e8c6994002f9a79fb0a36fbebe8b3d419af0f9ea881dd1bc439d03dbe3c6d6661e670f16575197c31f0bd7a' - 'c1ce2e8d6f42cbc8181aeb2bdc19d4a22bff804c18f6e505d8315a294c67c936e90135046812ec37765be3d0f433e31554604deb1d7b160549d7e3284610a22b') + 'c1ce2e8d6f42cbc8181aeb2bdc19d4a22bff804c18f6e505d8315a294c67c936e90135046812ec37765be3d0f433e31554604deb1d7b160549d7e3284610a22b' + '28bf078147cc2f3395d3f907d6d900c7976dbd9948a9513f1d7ef32a40b89fee55e243c9302d24eda62dc1f813857fa09ae79e6faf52881e463a163acb437380') validpgpkeys=( EC4AA0A991A5F2464582D52D2B6EF432EFC895FA # Jouni Malinen ) diff --git a/wpa_supplicant/deps b/wpa_supplicant/deps index aebeaba..e7dad6c 100644 --- a/wpa_supplicant/deps +++ b/wpa_supplicant/deps @@ -1,8 +1,6 @@ pcsclite dbus git - - docbook-sgml docbook-utils perl-sgmls