From c3788116e5dc9204c4aadb4f77b81146b22273c2 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 10 Nov 2024 22:18:11 +0100 Subject: [PATCH 1/5] xorg-xtrans-32: 1.5.1 -> 1.5.2 --- xorg-xtrans-32/.signature | 6 +++--- xorg-xtrans-32/Pkgfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xorg-xtrans-32/.signature b/xorg-xtrans-32/.signature index 8e743225..d382d2c9 100644 --- a/xorg-xtrans-32/.signature +++ b/xorg-xtrans-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXf927tavcNKCAPGiHEc7HBnfn31+f8Lob7BEsXVSI2hWth39Ge2rLMhMVrOUV5f42s/LukHZ58kBX3kkWaHSQw4= -SHA256 (Pkgfile) = 484c017826294f535f13586bae0d2bc4478668ca275579f59beae191eb7791bd +RWSwxGo/zH7eXdwB7CMZnu5cicCE9TYbCudv96Ii0+vLhjbjoVyNEhr9+YzWnYdZ6MT8kZ4KtKrs/A/60sS2BUEfCuFYMsJo+Qo= +SHA256 (Pkgfile) = 0c3fec850b0da85b635265b3d0994dae8aea4ee49f23eb49d9748490de9b6eda SHA256 (.footprint) = 5514f9c0b423d2ae91cb427ff6fe57c25a44a230023e1b3655229e80d0aa77a8 -SHA256 (xtrans-1.5.1.tar.xz) = dea80fbd8c3c941495b4b1d2785cb652815d016849a0d2ef90d1140de916993e +SHA256 (xtrans-1.5.2.tar.xz) = 5c5cbfe34764a9131d048f03c31c19e57fb4c682d67713eab6a65541b4dff86c diff --git a/xorg-xtrans-32/Pkgfile b/xorg-xtrans-32/Pkgfile index ab6bc1ec..c83e14eb 100644 --- a/xorg-xtrans-32/Pkgfile +++ b/xorg-xtrans-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-xtrans name=xorg-xtrans-32 -version=1.5.1 +version=1.5.2 release=1 source=(https://www.x.org/releases/individual/lib/xtrans-$version.tar.xz) From 03471d21a7cd953a44d3f5f455bc02dd980e5e93 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 10 Nov 2024 22:18:53 +0100 Subject: [PATCH 2/5] xorg-libxcursor-32: 1.2.2 -> 1.2.3 --- xorg-libxcursor-32/.signature | 6 +++--- xorg-libxcursor-32/Pkgfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xorg-libxcursor-32/.signature b/xorg-libxcursor-32/.signature index e107a9bb..de32cade 100644 --- a/xorg-libxcursor-32/.signature +++ b/xorg-libxcursor-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXQxY8+BEFa6WL6P+El0bT8/xrUS2hRZ0yTNiWppCuDgWw6ZWQyLmro3rt0huVQrBZ/9vjvzIE6311BzbGKq1gA0= -SHA256 (Pkgfile) = d1a5aaf7c439035658889241c00f6635c7a5ea35ac9a788ed065fd75ab78af27 +RWSwxGo/zH7eXaDtt4J9KNxCofgJr81vD+GvNTsAcezE9Au2WVkyiA3yhXUoze7qAPPUvYQo9HSdkGq0rnpCkmsxsKlZ/uRpbgE= +SHA256 (Pkgfile) = cda521ca6e589ffaf78a9c3c369864c090723c4bead7b292c9cae647b2cd5e0e SHA256 (.footprint) = 987a280727a428a2c91a0ed5e5f46a0c5568befc824d724bcc3252483bae377d -SHA256 (libXcursor-1.2.2.tar.xz) = 53d071bd2cc56e517a30998d5e685c8a74556ddada43c6985d14da9a023a88ee +SHA256 (libXcursor-1.2.3.tar.xz) = fde9402dd4cfe79da71e2d96bb980afc5e6ff4f8a7d74c159e1966afb2b2c2c0 diff --git a/xorg-libxcursor-32/Pkgfile b/xorg-libxcursor-32/Pkgfile index 99ae7cd1..f93bf1ac 100644 --- a/xorg-libxcursor-32/Pkgfile +++ b/xorg-libxcursor-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-libxcursor xorg-libxfixes-32 xorg-libxrender-32 name=xorg-libxcursor-32 -version=1.2.2 +version=1.2.3 release=1 source=(https://www.x.org/releases/individual/lib/libXcursor-$version.tar.xz) From 531f0345cabf1069ce880c87eea4398ff69b7704 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 10 Nov 2024 22:19:42 +0100 Subject: [PATCH 3/5] xorg-libpixman-32: 0.43.4 -> 0.44.0 --- xorg-libpixman-32/.footprint | 4 ++-- xorg-libpixman-32/.signature | 8 ++++---- xorg-libpixman-32/Pkgfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xorg-libpixman-32/.footprint b/xorg-libpixman-32/.footprint index eaee1023..e23edb35 100644 --- a/xorg-libpixman-32/.footprint +++ b/xorg-libpixman-32/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ lrwxrwxrwx root/root usr/lib32/libpixman-1.so -> libpixman-1.so.0 -lrwxrwxrwx root/root usr/lib32/libpixman-1.so.0 -> libpixman-1.so.0.43.4 --rwxr-xr-x root/root usr/lib32/libpixman-1.so.0.43.4 +lrwxrwxrwx root/root usr/lib32/libpixman-1.so.0 -> libpixman-1.so.0.44.0 +-rwxr-xr-x root/root usr/lib32/libpixman-1.so.0.44.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/pixman-1.pc diff --git a/xorg-libpixman-32/.signature b/xorg-libpixman-32/.signature index 8b638695..51d02875 100644 --- a/xorg-libpixman-32/.signature +++ b/xorg-libpixman-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXb2FQ6V8L1SDtwg910ejWbEjvXaog9XGx2sIl2mwZv/lOudSBGN4v9PgmqAlskj2488xHUhBl7z6ObatpPe6KwI= -SHA256 (Pkgfile) = 871a14cb1aaee4d1cf1d450bec73e9b9f6eab0095896cc5b7f3b6ec7844bcd3b -SHA256 (.footprint) = fe47aebff636c8de38d17010fb650e2c7c6b3a8ee582f4ef2e4953d711fc7083 -SHA256 (pixman-0.43.4.tar.xz) = 48d8539f35488d694a2fef3ce17394d1153ed4e71c05d1e621904d574be5df19 +RWSwxGo/zH7eXXGntSMxwnpGUBHAdf8FF4M7oZxAqgQ3Ruv/cCBo5tY25XJzr7JsnHLRRRoi7uvESHmPTn/7pFcPLy/Nd4k7nAc= +SHA256 (Pkgfile) = 3e53252a214d26c9c93457a9494aa4f18c6f056d3bf6f94379e10d38c831af17 +SHA256 (.footprint) = 1678fff4478aed0c841d706d8080ecd8139f3e1845f086252d025c852c35c0d3 +SHA256 (pixman-0.44.0.tar.xz) = ea55473db5ec9f068bbf4d14ec3186b742804bf74fdc782fc89aa87d2656fc46 diff --git a/xorg-libpixman-32/Pkgfile b/xorg-libpixman-32/Pkgfile index 5455182f..abfd03d1 100644 --- a/xorg-libpixman-32/Pkgfile +++ b/xorg-libpixman-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-libpixman name=xorg-libpixman-32 -version=0.43.4 +version=0.44.0 release=1 source=(https://www.x.org/releases/individual/lib/pixman-$version.tar.xz) From ac4b0009c04fd582181a1dad9a6c37290f45159e Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 10 Nov 2024 22:20:32 +0100 Subject: [PATCH 4/5] expat-32: 2.6.3 -> 2.6.4 --- expat-32/.footprint | 16 ++++++++-------- expat-32/.signature | 8 ++++---- expat-32/Pkgfile | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/expat-32/.footprint b/expat-32/.footprint index 2630ae15..b0273214 100644 --- a/expat-32/.footprint +++ b/expat-32/.footprint @@ -1,15 +1,15 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ drwxr-xr-x root/root usr/lib32/cmake/ -drwxr-xr-x root/root usr/lib32/cmake/expat-2.6.3/ --rw-r--r-- root/root usr/lib32/cmake/expat-2.6.3/expat-config-version.cmake --rw-r--r-- root/root usr/lib32/cmake/expat-2.6.3/expat-config.cmake --rw-r--r-- root/root usr/lib32/cmake/expat-2.6.3/expat-noconfig.cmake --rw-r--r-- root/root usr/lib32/cmake/expat-2.6.3/expat.cmake +drwxr-xr-x root/root usr/lib32/cmake/expat-2.6.4/ +-rw-r--r-- root/root usr/lib32/cmake/expat-2.6.4/expat-config-version.cmake +-rw-r--r-- root/root usr/lib32/cmake/expat-2.6.4/expat-config.cmake +-rw-r--r-- root/root usr/lib32/cmake/expat-2.6.4/expat-noconfig.cmake +-rw-r--r-- root/root usr/lib32/cmake/expat-2.6.4/expat.cmake -rw-r--r-- root/root usr/lib32/libexpat.a -rwxr-xr-x root/root usr/lib32/libexpat.la -lrwxrwxrwx root/root usr/lib32/libexpat.so -> libexpat.so.1.9.3 -lrwxrwxrwx root/root usr/lib32/libexpat.so.1 -> libexpat.so.1.9.3 --rwxr-xr-x root/root usr/lib32/libexpat.so.1.9.3 +lrwxrwxrwx root/root usr/lib32/libexpat.so -> libexpat.so.1.10.0 +lrwxrwxrwx root/root usr/lib32/libexpat.so.1 -> libexpat.so.1.10.0 +-rwxr-xr-x root/root usr/lib32/libexpat.so.1.10.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/expat.pc diff --git a/expat-32/.signature b/expat-32/.signature index fbbef1fe..3e44bfd2 100644 --- a/expat-32/.signature +++ b/expat-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXZYuYRU9aRd8n42DzFEekEP/l3ZtIqGlCSArR25D4jCZs24S85VqNoSz5BhLnYnKIzEofSDoOr+HvwqVR/txxwk= -SHA256 (Pkgfile) = 17b7ddeb01aac6207796467151080eec3e02754e4474e40ba670d33812906ac8 -SHA256 (.footprint) = 62f9e377a45584dbcb22b25d505135667dd00af331ee94a279ea35214aa255fc -SHA256 (expat-2.6.3.tar.bz2) = b8baef92f328eebcf731f4d18103951c61fa8c8ec21d5ff4202fb6f2198aeb2d +RWSwxGo/zH7eXTuqV7eLBAYkPGWUgdvnk1THedklG/Y1XsTBwXVmlbeF+wZqr+Uji27L5cwGEpdiNPZzLSjQq63IzHZyng8NuAM= +SHA256 (Pkgfile) = 6edab54d3d9e478277f1ad8ca510dfd67c07ff72e4a8465bbfbeb9d43e7bdfb5 +SHA256 (.footprint) = 05f786b4ee47623dbf126c3ac6e863be63ce7e41107fec25c5e716e94a40d637 +SHA256 (expat-2.6.4.tar.bz2) = 8dc480b796163d4436e6f1352e71800a774f73dbae213f1860b60607d2a83ada diff --git a/expat-32/Pkgfile b/expat-32/Pkgfile index 8cc4ac88..423a228a 100644 --- a/expat-32/Pkgfile +++ b/expat-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: expat name=expat-32 -version=2.6.3 +version=2.6.4 release=1 source=(https://downloads.sourceforge.net/project/${name%-*}/${name%-*}/$version/${name%-*}-$version.tar.bz2) From 288eca355bdbcbf292b1bcc5a75a5cf062035edb Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 10 Nov 2024 22:24:11 +0100 Subject: [PATCH 5/5] curl-32: 8.10.1 -> 8.11.0 --- curl-32/.signature | 7 ++--- ...c429f26c27294787dc59d7b53345d9edc5aa.patch | 26 +++++++++++++++++++ curl-32/Pkgfile | 7 +++-- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch diff --git a/curl-32/.signature b/curl-32/.signature index d5e74aa6..87f5ff07 100644 --- a/curl-32/.signature +++ b/curl-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXT77+RJB8lnzNCOP30cTvsaN2FFMhQBF1yOmAzWR/bUCcEMbkCgHxzK1VzK8iYIhAIxXiK7+YyL0iA/LIbMTdgg= -SHA256 (Pkgfile) = 95ced179564ce4ea782240a25d0e7b653f80d01e6cab4216d0fe1b1e647d6018 +RWSwxGo/zH7eXbkKhFoHwLs8SwIkt2YFvTdE1unPSc/XPTbGH4VXbaBdklQMqzCGifnAitFIO+/n/FWPzmvZsHYWrnrQO0RkkgQ= +SHA256 (Pkgfile) = 360e4e44106f57e7169cfbcadae7ec8e5470d0d6ac271008cf7d99ae8bf57afc SHA256 (.footprint) = 1f49d30883c63da2e3d72a616a65fa40806923dd3c80aa299aebe1ceb544379b -SHA256 (curl-8.10.1.tar.xz) = 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee +SHA256 (curl-8.11.0.tar.xz) = db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb +SHA256 (878bc429f26c27294787dc59d7b53345d9edc5aa.patch) = 2b1f6b09167a3b90c3e13d692a880dd83c20dbf02e5f6036176f8024d2d3cfcc diff --git a/curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch b/curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch new file mode 100644 index 00000000..f64546b6 --- /dev/null +++ b/curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch @@ -0,0 +1,26 @@ +From 878bc429f26c27294787dc59d7b53345d9edc5aa Mon Sep 17 00:00:00 2001 +From: Jesus Malo Poyatos +Date: Thu, 7 Nov 2024 14:00:53 +0100 +Subject: [PATCH] setopt: fix CURLOPT_HTTP_CONTENT_DECODING + +Regression from 30da1f5974d34841b30c4f (shipped in 8.11.0) + +Fixes #15511 +Closes #15510 +--- + lib/setopt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/setopt.c b/lib/setopt.c +index 4f0697212739ef..ba80644bc73279 100644 +--- a/lib/setopt.c ++++ b/lib/setopt.c +@@ -1146,7 +1146,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option, + /* + * raw data passed to the application when content encoding is used + */ +- data->set.http_ce_skip = enabled; ++ data->set.http_ce_skip = !enabled; /* reversed */ + break; + + #if !defined(CURL_DISABLE_FTP) || defined(USE_SSH) diff --git a/curl-32/Pkgfile b/curl-32/Pkgfile index 3cf81666..261e1b1f 100644 --- a/curl-32/Pkgfile +++ b/curl-32/Pkgfile @@ -5,9 +5,10 @@ # Optional: brotli-32 name=curl-32 -version=8.10.1 +version=8.11.0 release=1 -source=(https://curl.se/download/${name%-*}-$version.tar.xz) +source=(https://curl.se/download/${name%-*}-$version.tar.xz + 878bc429f26c27294787dc59d7b53345d9edc5aa.patch) build() { cd ${name%-*}-$version @@ -17,6 +18,8 @@ build() { before continuing with curl-32.\033[0m\n" && exit 1 + patch -Np1 -i $SRC/878bc429f26c27294787dc59d7b53345d9edc5aa.patch + ./configure --prefix=/usr \ --libdir=/usr/lib32 \ --enable-ipv6 \